From c5244fcf69187b6a2d1ca62522454a4e29b4e41d Mon Sep 17 00:00:00 2001 From: Coly Li Date: Thu, 2 Apr 2009 16:59:39 -0700 Subject: [PATCH] --- yaml --- r: 139763 b: refs/heads/master c: 054475d2af2640a6d6cb83b528512c7b49eef9ca h: refs/heads/master i: 139761: 7cf61e61ac3d872312dd58a164e2666dc7ce1690 139759: 9b8a62bf0464c624fc55b3178f40c220b1746f15 v: v3 --- [refs] | 2 +- trunk/fs/minix/inode.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b4e776e24f3e..77bea6f5c414 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2430c4daf9e6cc6b144906a41f7f28c3f6ae5a2c +refs/heads/master: 054475d2af2640a6d6cb83b528512c7b49eef9ca diff --git a/trunk/fs/minix/inode.c b/trunk/fs/minix/inode.c index 618865b3128b..daad3c2740db 100644 --- a/trunk/fs/minix/inode.c +++ b/trunk/fs/minix/inode.c @@ -321,15 +321,20 @@ static int minix_fill_super(struct super_block *s, void *data, int silent) 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; }