about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2010-09-27 22:34:21 -0400
committerPetr Baudis <pasky@suse.cz>2010-11-20 18:58:52 +0100
commit42c95109b2e56489a19c64910bd6127a11e2279b (patch)
treec94cc2d401ad1ae8083ac95ae1bf83e69db62385 /sysdeps
parent1e0bcc2ee3019028aa39dd710e32dd8158395328 (diff)
downloadglibc-42c95109b2e56489a19c64910bd6127a11e2279b.tar.gz
glibc-42c95109b2e56489a19c64910bd6127a11e2279b.tar.xz
glibc-42c95109b2e56489a19c64910bd6127a11e2279b.zip
Properly convert f_fsid in statvfs
(cherry picked from commit c21cc9bcb38a87ff638d1099ca871d94a2192b31)
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/internal_statvfs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/internal_statvfs.c b/sysdeps/unix/sysv/linux/internal_statvfs.c
index 28c1cb691f..6066c86993 100644
--- a/sysdeps/unix/sysv/linux/internal_statvfs.c
+++ b/sysdeps/unix/sysv/linux/internal_statvfs.c
@@ -214,7 +214,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])))));