xfs
[Top] [All Lists]

[PATCH] xfsdump: don't assume getdents exists

To: sandeen@xxxxxxxxxx
Subject: [PATCH] xfsdump: don't assume getdents exists
From: Kyle McMartin <kyle@xxxxxxxxxx>
Date: Wed, 6 Nov 2013 16:36:35 -0500
Cc: xfs@xxxxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
User-agent: Mutt/1.5.21 (2010-09-15)
New Linux ports are using a standard syscall list that does not include
deprecated syscalls where 64-bit clean alternatives exist. As a result,
on arm64, __NR_getdents is undefined, resulting in xfsdump failing to
build.

To avoid that, in the case where __NR_getdents is unset in unistd.h,
avoid building the fallback path entirely, since
__ASSUME_GETDENTS64_SYSCALL will be true, the SYS_getdents64 case will
be the primary (and only) path used.

Signed-off-by: Kyle McMartin <kyle@xxxxxxxxxx>

--- a/common/getdents.c
+++ b/common/getdents.c
@@ -70,6 +70,9 @@ extern int __have_no_getdents64;
 # ifndef SYS_getdents64
 #  define SYS_getdents64 __NR_getdents64
 # endif
+# ifndef __NR_getdents
+#  define __ONLY_GETDENTS64_SYSCALL     1
+# endif
 #endif
 
 
@@ -207,6 +210,13 @@ getdents_wrap (int fd, char *buf, size_t nbytes)
 # endif
     }
 #endif
+/* Newer Linux ports are not adding deprecated syscalls, so to avoid compile
+ * failures since SYS_getdents will be undefined, we check for that and only
+ * build the fall-back case if SYS_getdents is defined. We know that
+ * __ASSUME_GETDENTS64_SYSCALL is set, since __NR_getdents64 must exist on
+ * those platforms.
+ */
+#ifndef __ONLY_GETDENTS64_SYSCALL
   {
     size_t red_nbytes;
     struct kernel_dirent *skdp, *kdp;
@@ -265,4 +275,5 @@ getdents_wrap (int fd, char *buf, size_t nbytes)
     }
 
   return (char *) dp - buf;
+#endif
 }

<Prev in Thread] Current Thread [Next in Thread>