diff options
author | Coly Li <coly.li@suse.de> | 2009-04-02 19:59:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-02 22:05:09 -0400 |
commit | 054475d2af2640a6d6cb83b528512c7b49eef9ca (patch) | |
tree | 2790c3043ff7be3f45fdbdd129c4ab917dc7a191 /fs | |
parent | 2430c4daf9e6cc6b144906a41f7f28c3f6ae5a2c (diff) |
fs/minix: return f_fsid for statfs(2)
Make minix file system return f_fsid info for statfs(2).
Signed-off-by: Coly Li <coly.li@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/minix/inode.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/minix/inode.c b/fs/minix/inode.c index 618865b3128b..daad3c2740db 100644 --- a/fs/minix/inode.c +++ b/fs/minix/inode.c | |||
@@ -321,15 +321,20 @@ out: | |||
321 | 321 | ||
322 | static int minix_statfs(struct dentry *dentry, struct kstatfs *buf) | 322 | static int minix_statfs(struct dentry *dentry, struct kstatfs *buf) |
323 | { | 323 | { |
324 | struct minix_sb_info *sbi = minix_sb(dentry->d_sb); | 324 | struct super_block *sb = dentry->d_sb; |
325 | buf->f_type = dentry->d_sb->s_magic; | 325 | struct minix_sb_info *sbi = minix_sb(sb); |
326 | buf->f_bsize = dentry->d_sb->s_blocksize; | 326 | u64 id = huge_encode_dev(sb->s_bdev->bd_dev); |
327 | buf->f_type = sb->s_magic; | ||
328 | buf->f_bsize = sb->s_blocksize; | ||
327 | buf->f_blocks = (sbi->s_nzones - sbi->s_firstdatazone) << sbi->s_log_zone_size; | 329 | buf->f_blocks = (sbi->s_nzones - sbi->s_firstdatazone) << sbi->s_log_zone_size; |
328 | buf->f_bfree = minix_count_free_blocks(sbi); | 330 | buf->f_bfree = minix_count_free_blocks(sbi); |
329 | buf->f_bavail = buf->f_bfree; | 331 | buf->f_bavail = buf->f_bfree; |
330 | buf->f_files = sbi->s_ninodes; | 332 | buf->f_files = sbi->s_ninodes; |
331 | buf->f_ffree = minix_count_free_inodes(sbi); | 333 | buf->f_ffree = minix_count_free_inodes(sbi); |
332 | buf->f_namelen = sbi->s_namelen; | 334 | buf->f_namelen = sbi->s_namelen; |
335 | buf->f_fsid.val[0] = (u32)id; | ||
336 | buf->f_fsid.val[1] = (u32)(id >> 32); | ||
337 | |||
333 | return 0; | 338 | return 0; |
334 | } | 339 | } |
335 | 340 | ||