diff --git a/[refs] b/[refs] index 57b9438513e1..9991900d9207 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5b76dc066a4deb937665521566f89aead756f049 +refs/heads/master: 651d0623045d3265a21ab9803b3a1e0f24a17461 diff --git a/trunk/fs/reiserfs/Kconfig b/trunk/fs/reiserfs/Kconfig index 949b8c6addc8..513f431038f9 100644 --- a/trunk/fs/reiserfs/Kconfig +++ b/trunk/fs/reiserfs/Kconfig @@ -1,5 +1,6 @@ config REISERFS_FS tristate "Reiserfs support" + select CRC32 help Stores not just filenames but the files themselves in a balanced tree. Uses journalling. diff --git a/trunk/fs/reiserfs/super.c b/trunk/fs/reiserfs/super.c index 972250c62896..0ae6486d9046 100644 --- a/trunk/fs/reiserfs/super.c +++ b/trunk/fs/reiserfs/super.c @@ -27,6 +27,7 @@ #include #include #include +#include struct file_system_type reiserfs_fs_type; @@ -1904,6 +1905,10 @@ static int reiserfs_statfs(struct dentry *dentry, struct kstatfs *buf) buf->f_bsize = dentry->d_sb->s_blocksize; /* changed to accommodate gcc folks. */ buf->f_type = REISERFS_SUPER_MAGIC; + buf->f_fsid.val[0] = (u32)crc32_le(0, rs->s_uuid, sizeof(rs->s_uuid)/2); + buf->f_fsid.val[1] = (u32)crc32_le(0, rs->s_uuid + sizeof(rs->s_uuid)/2, + sizeof(rs->s_uuid)/2); + return 0; }