From 7591996e2092bf3886e7d013ae08a747977056a6 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Wed, 6 Dec 2006 20:35:28 -0800 Subject: [PATCH] --- yaml --- r: 42763 b: refs/heads/master c: 50ee0a32b192902e32a2b596df7ec3496c4bf485 h: refs/heads/master i: 42761: ed8c42c3b8b3266c057d3bc8af50b2c695e6d727 42759: 58cb65aaf53afd60b9eb0568b45106d6853bfef5 v: v3 --- [refs] | 2 +- trunk/fs/ext3/super.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fe6aa64da461..2d927bf52053 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4fca01ea2b41c41a82f4ca3537f6ebc237adde5 +refs/heads/master: 50ee0a32b192902e32a2b596df7ec3496c4bf485 diff --git a/trunk/fs/ext3/super.c b/trunk/fs/ext3/super.c index 9856565d4ddc..8ab198133357 100644 --- a/trunk/fs/ext3/super.c +++ b/trunk/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; }