diff options
author | Coly Li <coly.li@suse.de> | 2009-04-02 19:59:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-02 22:05:10 -0400 |
commit | 651d0623045d3265a21ab9803b3a1e0f24a17461 (patch) | |
tree | dcfe9c374fcf7f36601a870837f19877d926f9aa | |
parent | 5b76dc066a4deb937665521566f89aead756f049 (diff) |
fs/reiserfs: return f_fsid for statfs(2)
Make reiserfs3 return f_fsid info for statfs(2). By Andreas' suggestion,
this patch populates a persistent f_fsid between boots/mounts with help of
on-disk uuid record.
Randy Dunlap reported a compiling error from v2 patch like:
fs/built-in.o: In function `reiserfs_statfs':
super.c:(.text+0x7332b): undefined reference to `crc32_le'
super.c:(.text+0x7333f): undefined reference to `crc32_le'
Also he provided helpful solution to fix this error. The modification of v3
patch is based on Randy's suggestion, add 'select CRC32' in fs/reiserfs/Kconfig.
Signed-off-by: Coly Li <coly.li@suse.de>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/reiserfs/Kconfig | 1 | ||||
-rw-r--r-- | fs/reiserfs/super.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/fs/reiserfs/Kconfig b/fs/reiserfs/Kconfig index 949b8c6addc8..513f431038f9 100644 --- a/fs/reiserfs/Kconfig +++ b/fs/reiserfs/Kconfig | |||
@@ -1,5 +1,6 @@ | |||
1 | config REISERFS_FS | 1 | config REISERFS_FS |
2 | tristate "Reiserfs support" | 2 | tristate "Reiserfs support" |
3 | select CRC32 | ||
3 | help | 4 | help |
4 | Stores not just filenames but the files themselves in a balanced | 5 | Stores not just filenames but the files themselves in a balanced |
5 | tree. Uses journalling. | 6 | tree. Uses journalling. |
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 972250c62896..0ae6486d9046 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/mnt_namespace.h> | 27 | #include <linux/mnt_namespace.h> |
28 | #include <linux/mount.h> | 28 | #include <linux/mount.h> |
29 | #include <linux/namei.h> | 29 | #include <linux/namei.h> |
30 | #include <linux/crc32.h> | ||
30 | 31 | ||
31 | struct file_system_type reiserfs_fs_type; | 32 | struct file_system_type reiserfs_fs_type; |
32 | 33 | ||
@@ -1904,6 +1905,10 @@ static int reiserfs_statfs(struct dentry *dentry, struct kstatfs *buf) | |||
1904 | buf->f_bsize = dentry->d_sb->s_blocksize; | 1905 | buf->f_bsize = dentry->d_sb->s_blocksize; |
1905 | /* changed to accommodate gcc folks. */ | 1906 | /* changed to accommodate gcc folks. */ |
1906 | buf->f_type = REISERFS_SUPER_MAGIC; | 1907 | buf->f_type = REISERFS_SUPER_MAGIC; |
1908 | buf->f_fsid.val[0] = (u32)crc32_le(0, rs->s_uuid, sizeof(rs->s_uuid)/2); | ||
1909 | buf->f_fsid.val[1] = (u32)crc32_le(0, rs->s_uuid + sizeof(rs->s_uuid)/2, | ||
1910 | sizeof(rs->s_uuid)/2); | ||
1911 | |||
1907 | return 0; | 1912 | return 0; |
1908 | } | 1913 | } |
1909 | 1914 | ||