Skip to contentSkip to conversation

fs/minix: return f_fsid for statfs(2)

PATCH In review Coly Li 1 participant 1 message Jan 19, 2009

lore
Share & tools
lore

Coly Li

author
#0 lore raw

PATCH 12/20 fs/minix: return f_fsid for statfs(2)

This patch makes minix file system return f_fsid info for statfs(2).

Cc Andrew Morton <[email protected]>
---
 fs/minix/inode.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
fs/minix/inode.c +8 -3
index d1d1eb8..f6f23b6 100644
@@ -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;
 }
 
Signature · 2 lines
Coly Li
SuSE Labs