Switch out libc::renameat for libc::renameat2 and consolidate musl/glibc

Author: frc4533-lincoln

src/devices/src/virtio/fs/linux/overlayfs.rs

@@ -1996,24 +1996,15 @@ impl OverlayFs {
 
         // Perform the rename
         let res = unsafe {
-            #[cfg(target_env = "gnu")]
+            #[cfg(any(target_env = "gnu", target_env = "musl"))]
             {
-            libc::renameat2(
-                old_parent_data.file.as_raw_fd(),
-                old_name.as_ptr(),
-                new_parent_data.file.as_raw_fd(),
-                new_name.as_ptr(),
-                flags,
-            )
-            }
-            #[cfg(target_env = "musl")]
-            {
-            libc::renameat(
-                old_parent_data.file.as_raw_fd(),
-                old_name.as_ptr(),
-                new_parent_data.file.as_raw_fd(),
-                new_name.as_ptr(),
-            )
+                libc::renameat2(
+                    old_parent_data.file.as_raw_fd(),
+                    old_name.as_ptr(),
+                    new_parent_data.file.as_raw_fd(),
+                    new_name.as_ptr(),
+                    flags,
+                )
             }
         };