summaryrefslogtreecommitdiffstats
path: root/fs/ext3
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2006-12-06 20:35:28 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 08:39:31 -0800
commit50ee0a32b192902e32a2b596df7ec3496c4bf485 (patch)
treef7f1a18ba215bfd4b313a70a8d1c9a9e4a75a044 /fs/ext3
parente4fca01ea2b41c41a82f4ca3537f6ebc237adde5 (diff)
downloadlinux-stable-50ee0a32b192902e32a2b596df7ec3496c4bf485.tar.gz
linux-stable-50ee0a32b192902e32a2b596df7ec3496c4bf485.tar.bz2
linux-stable-50ee0a32b192902e32a2b596df7ec3496c4bf485.zip
[PATCH] ext3: fsid for statvfs
Update ext3_statfs to return an FSID that is a 64 bit XOR of the 128 bit filesystem UUID as suggested by Andreas Dilger. See the following Bugzilla entry for details: http://bugzilla.kernel.org/show_bug.cgi?id=136 Cc: Andreas Dilger <adilger@clusterfs.com> Cc: Stephen Tweedie <sct@redhat.com> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/ext3')
-rw-r--r--fs/ext3/super.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 9856565d4ddc..8ab198133357 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2387,6 +2387,7 @@ static int ext3_statfs (struct dentry * dentry, struct kstatfs * buf)
struct ext3_super_block *es = sbi->s_es;
ext3_fsblk_t overhead;
int i;
+ u64 fsid;
if (test_opt (sb, MINIX_DF))
overhead = 0;
@@ -2433,6 +2434,10 @@ static int ext3_statfs (struct dentry * dentry, struct kstatfs * buf)
buf->f_files = le32_to_cpu(es->s_inodes_count);
buf->f_ffree = percpu_counter_sum(&sbi->s_freeinodes_counter);
buf->f_namelen = EXT3_NAME_LEN;
+ fsid = le64_to_cpup((void *)es->s_uuid) ^
+ le64_to_cpup((void *)es->s_uuid + sizeof(u64));
+ buf->f_fsid.val[0] = fsid & 0xFFFFFFFFUL;
+ buf->f_fsid.val[1] = (fsid >> 32) & 0xFFFFFFFFUL;
return 0;
}