Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...

[sfrench/cifs-2.6.git] / fs / minix / inode.c

diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index 618865b3128ba7534a0971167ad608633591e31b..daad3c2740dbd5d85d7afee2f07c3ffdb8f996f3 100644 (file)
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -321,15 +321,20 @@ out:
 
 static int minix_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
-       struct minix_sb_info *sbi = minix_sb(dentry->d_sb);
-       buf->f_type = dentry->d_sb->s_magic;
-       buf->f_bsize = dentry->d_sb->s_blocksize;
+       struct super_block *sb = dentry->d_sb;
+       struct minix_sb_info *sbi = minix_sb(sb);
+       u64 id = huge_encode_dev(sb->s_bdev->bd_dev);
+       buf->f_type = sb->s_magic;
+       buf->f_bsize = sb->s_blocksize;
        buf->f_blocks = (sbi->s_nzones - sbi->s_firstdatazone) << sbi->s_log_zone_size;
        buf->f_bfree = minix_count_free_blocks(sbi);
        buf->f_bavail = buf->f_bfree;
        buf->f_files = sbi->s_ninodes;
        buf->f_ffree = minix_count_free_inodes(sbi);
        buf->f_namelen = sbi->s_namelen;
+       buf->f_fsid.val[0] = (u32)id;
+       buf->f_fsid.val[1] = (u32)(id >> 32);
+
        return 0;
 }