The patch titled fs/efs: return f_fsid for statfs(2) has been added to the -mm tree. Its filename is fs-efs-return-f_fsid-for-statfs2.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: fs/efs: return f_fsid for statfs(2) From: Coly Li <coly.li@xxxxxxx> Make efs return f_fsid info for statfs(2), and do a little variable renaming in efs_statfs(). Signed-off-by: Coly Li <coly.li@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/efs/super.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff -puN fs/efs/super.c~fs-efs-return-f_fsid-for-statfs2 fs/efs/super.c --- a/fs/efs/super.c~fs-efs-return-f_fsid-for-statfs2 +++ a/fs/efs/super.c @@ -329,18 +329,22 @@ out_no_fs: } static int efs_statfs(struct dentry *dentry, struct kstatfs *buf) { - struct efs_sb_info *sb = SUPER_INFO(dentry->d_sb); + struct super_block *sb = dentry->d_sb; + struct efs_sb_info *sbi = SUPER_INFO(sb); + u64 id = huge_encode_dev(sb->s_bdev->bd_dev); buf->f_type = EFS_SUPER_MAGIC; /* efs magic number */ buf->f_bsize = EFS_BLOCKSIZE; /* blocksize */ - buf->f_blocks = sb->total_groups * /* total data blocks */ - (sb->group_size - sb->inode_blocks); - buf->f_bfree = sb->data_free; /* free data blocks */ - buf->f_bavail = sb->data_free; /* free blocks for non-root */ - buf->f_files = sb->total_groups * /* total inodes */ - sb->inode_blocks * + buf->f_blocks = sbi->total_groups * /* total data blocks */ + (sbi->group_size - sbi->inode_blocks); + buf->f_bfree = sbi->data_free; /* free data blocks */ + buf->f_bavail = sbi->data_free; /* free blocks for non-root */ + buf->f_files = sbi->total_groups * /* total inodes */ + sbi->inode_blocks * (EFS_BLOCKSIZE / sizeof(struct efs_dinode)); - buf->f_ffree = sb->inode_free; /* free inodes */ + buf->f_ffree = sbi->inode_free; /* free inodes */ + buf->f_fsid.val[0] = (u32)id; + buf->f_fsid.val[1] = (u32)(id >> 32); buf->f_namelen = EFS_MAXNAMELEN; /* max filename length */ return 0; _ Patches currently in -mm which might be from coly.li@xxxxxxx are fs-adfs-return-f_fsid-for-statfs2.patch fs-affs-return-f_fsid-for-statfs2.patch fs-befs-return-f_fsid-for-statfs2.patch fs-cramfs-return-f_fsid-for-statfs2.patch fs-efs-return-f_fsid-for-statfs2.patch fs-fat-return-f_fsid-for-statfs2.patch fs-hfs-return-f_fsid-for-statfs2.patch fs-hfsplus-return-f_fsid-for-statfs2.patch fs-hpfs-return-f_fsid-for-statfs2.patch fs-isofs-return-f_fsid-for-statfs2.patch fs-jfs-return-f_fsid-for-statfs2.patch fs-minix-return-f_fsid-for-statfs2.patch fs-omfs-return-f_fsid-for-statfs2.patch fs-qnx4-return-f_fsid-for-statfs2.patch fs-reiserfs-return-f_fsid-for-statfs2.patch fs-romfs-return-f_fsid-for-statfs2.patch fs-squashfs-return-f_fsid-for-statfs2.patch fs-sysv-return-f_fsid-for-statfs2.patch fs-udf-return-f_fsid-for-statfs2.patch fs-ufs-return-f_fsid-for-statfs2.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html