---

yaml --- r: 139763 b: refs/heads/master c: 054475d h: refs/heads/master i: 139761: 7cf61e6 139759: 9b8a62b v: v3
git-mirror · Apr 3, 2009 · c5244fc · c5244fc
1 parent 184d22d
commit c5244fc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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;
 }