The patch titled
xfs: move XFS_IOC_GETVERSION to main multiplexer
has been added to the -mm tree. Its filename is
xfs-move-xfs_ioc_getversion-to-main-multiplexer.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: xfs: move XFS_IOC_GETVERSION to main multiplexer
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
* Don't do inode => vnode => inode conversion, use passed inode directly
* Don't allocate and free memory on each call
* As a consequence, don't have a chance to return ENOMEM, which would be
truly bizarre error code for this ioctl.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Nathan Scott <nathans@xxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/xfs/linux-2.6/xfs_ioctl.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff -puN fs/xfs/linux-2.6/xfs_ioctl.c~xfs-move-xfs_ioc_getversion-to-main-multiplexer fs/xfs/linux-2.6/xfs_ioctl.c
--- a/fs/xfs/linux-2.6/xfs_ioctl.c~xfs-move-xfs_ioc_getversion-to-main-multiplexer
+++ a/fs/xfs/linux-2.6/xfs_ioctl.c
@@ -763,6 +763,8 @@ xfs_ioctl(
return xfs_ioc_fsgeometry(mp, arg);
case XFS_IOC_GETVERSION:
+ return put_user(inode->i_generation, (int __user *)arg);
+
case XFS_IOC_GETXFLAGS:
case XFS_IOC_SETXFLAGS:
case XFS_IOC_FSGETXATTR:
@@ -1264,13 +1266,6 @@ xfs_ioc_xattr(
break;
}
- case XFS_IOC_GETVERSION: {
- flags = vn_to_inode(vp)->i_generation;
- if (copy_to_user(arg, &flags, sizeof(flags)))
- error = -EFAULT;
- break;
- }
-
default:
error = -ENOTTY;
break;
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
megaraid-fix-warnings-when-config_proc_fs=n.patch
git-xfs.patch
xfs-move-xfs_ioc_getversion-to-main-multiplexer.patch
cris-switch-to-iminor-imajor.patch
pcf8563-remove-mod_inc_use_count-mod_dec_use_count.patch
aoe-cleanup-i_rdev-usage.patch
isdn-cleanup-i_rdev-udage.patch
documentation-ioctl-messtxt-start-tree-wide-ioctl-registry.patch
ioctl-messtxt-xfs-typos.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
