Properly convert f_fsid in statvfs

diff --git a/ChangeLog b/ChangeLog
index d7f0819..13d3df8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-27  Andreas Schwab  <schwab@redhat.com>
+
+       [BZ #11611]
+       * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS):
+       Mask out sign-bit copies when constructing f_fsid.
+
 2010-09-24  Petr Baudis <pasky@suse.cz>
 
        * debug/stack_chk_fail_local.c: Add missing licence exception.

diff --git a/sysdeps/unix/sysv/linux/internal_statvfs.c b/sysdeps/unix/sysv/linux/internal_statvfs.c
index 0169ae3..83ffb99 100644 (file)
--- a/sysdeps/unix/sysv/linux/internal_statvfs.c
+++ b/sysdeps/unix/sysv/linux/internal_statvfs.c
@@ -228,7 +228,8 @@ INTERNAL_STATVFS (const char *name, struct STATVFS *buf,
   buf->f_files = fsbuf->f_files;
   buf->f_ffree = fsbuf->f_ffree;
   if (sizeof (buf->f_fsid) == sizeof (fsbuf->f_fsid))
-    buf->f_fsid = (fsbuf->f_fsid.__val[0]
+    buf->f_fsid = ((fsbuf->f_fsid.__val[0]
+                   & ((1UL << (8 * sizeof (fsbuf->f_fsid.__val[0]))) - 1))
                   | ((unsigned long int) fsbuf->f_fsid.__val[1]
                      << (8 * (sizeof (buf->f_fsid)
                               - sizeof (fsbuf->f_fsid.__val[0])))));