[Libsysio-commit] cplant: libsysio/drivers/native fs_native.c

[Ruth K. <rk...@us...>]

Update of /cvsroot/libsysio/libsysio/drivers/native
In directory sc8-pr-cvs1:/tmp/cvs-serv20601/drivers/native

Modified Files:
      Tag: cplant
	fs_native.c 
Log Message:
backport to RH6.2 cplant environment

Index: fs_native.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/drivers/native/fs_native.c,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -w -b -B -p -r1.16 -r1.16.2.1
--- fs_native.c	14 Aug 2003 18:39:33 -0000	1.16
+++ fs_native.c	20 Aug 2003 21:05:49 -0000	1.16.2.1
@@ -155,6 +155,11 @@ do {                                    
 #define __SYS_UTIME SYS_utime
 #endif
 
+#if defined(USE_GETDENTS64)
+#define __SYS_GETDENTS SYS_getdents64
+#else
+#define __SYS_GETDENTS SYS_getdents
+#endif
 /*
  * Native file identifiers format.
  */
@@ -847,7 +852,7 @@ native_getdirentries(struct inode *ino,
 		       SEEK_SET) == -1)
 		return -errno;
 	nino->ni_fpos = result;
-	cc = syscall(SYS_getdents64, nino->ni_fd, buf, nbytes);
+	cc = syscall(__SYS_GETDENTS, nino->ni_fd, buf, nbytes);
 	if (cc < 0)
 		return -errno;
 	nino->ni_fpos += cc;
@@ -1220,7 +1225,12 @@ native_inop_statvfs(struct pnode *pno,
 	buf->f_files = fs.f_files;  /* Total number serial numbers */
 	buf->f_ffree = fs.f_ffree;  /* Number free serial numbers */
 	buf->f_favail = fs.f_ffree; /* Number free ser num for non-privileged*/
+#if (__GLIBC__  == 2 && __GLIBC_MINOR__ == 1)
+	buf->f_fsid.__val[0] = fs.f_fsid.__val[0];
+	buf->f_fsid.__val[1] = fs.f_fsid.__val[1];
+#else
 	buf->f_fsid = fs.f_fsid.__val[1];
+#endif
 	buf->f_flag = 0;            /* No equiv in statfs; maybe use type? */
 	buf->f_namemax = fs.f_namelen;
 	return 0;