mm-commits.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [merged] fs-affs-return-f_fsid-for-statfs2.patch removed from -mm tree
@ 2009-04-06 19:38 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2009-04-06 19:38 UTC (permalink / raw)
  To: coly.li, zippel, mm-commits


The patch titled
     fs/affs: return f_fsid for statfs(2)
has been removed from the -mm tree.  Its filename was
     fs-affs-return-f_fsid-for-statfs2.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: fs/affs: return f_fsid for statfs(2)
From: Coly Li <coly.li@suse.de>

Make affs return f_fsid info for statfs(2).

Signed-off-by: Coly Li <coly.li@suse.de>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/affs/super.c |    4 ++++
 1 file changed, 4 insertions(+)

diff -puN fs/affs/super.c~fs-affs-return-f_fsid-for-statfs2 fs/affs/super.c
--- a/fs/affs/super.c~fs-affs-return-f_fsid-for-statfs2
+++ a/fs/affs/super.c
@@ -533,6 +533,7 @@ affs_statfs(struct dentry *dentry, struc
 {
 	struct super_block *sb = dentry->d_sb;
 	int		 free;
+	u64		 id = huge_encode_dev(sb->s_bdev->bd_dev);
 
 	pr_debug("AFFS: statfs() partsize=%d, reserved=%d\n",AFFS_SB(sb)->s_partition_size,
 	     AFFS_SB(sb)->s_reserved);
@@ -543,6 +544,9 @@ affs_statfs(struct dentry *dentry, struc
 	buf->f_blocks  = AFFS_SB(sb)->s_partition_size - AFFS_SB(sb)->s_reserved;
 	buf->f_bfree   = free;
 	buf->f_bavail  = free;
+	buf->f_fsid.val[0] = (u32)id;
+	buf->f_fsid.val[1] = (u32)(id >> 32);
+	buf->f_namelen = 30;
 	return 0;
 }
 
_

Patches currently in -mm which might be from coly.li@suse.de are

origin.patch
fs-romfs-return-f_fsid-for-statfs2.patch


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-04-06 19:41 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-04-06 19:38 [merged] fs-affs-return-f_fsid-for-statfs2.patch removed from -mm tree akpm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).