The patch titled
xfs: pass inode to xfs_ioc_space()
has been added to the -mm tree. Its filename is
xfs-pass-inode-to-xfs_ioc_space.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: pass inode to xfs_ioc_space()
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
* There is trivial "inode => vnode => inode" conversion, but only flags and
mode of final inode are looked at. Pass original inode instead.
* Two occurences of bhv_vnode_t go out.
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 | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff -puN fs/xfs/linux-2.6/xfs_ioctl.c~xfs-pass-inode-to-xfs_ioc_space fs/xfs/linux-2.6/xfs_ioctl.c
--- 25/fs/xfs/linux-2.6/xfs_ioctl.c~xfs-pass-inode-to-xfs_ioc_space Tue Jun 20 15:22:30 2006
+++ 25-akpm/fs/xfs/linux-2.6/xfs_ioctl.c Tue Jun 20 15:22:30 2006
@@ -653,7 +653,7 @@ xfs_attrmulti_by_handle(
STATIC int
xfs_ioc_space(
bhv_desc_t *bdp,
- bhv_vnode_t *vp,
+ struct inode *inode,
struct file *filp,
int flags,
unsigned int cmd,
@@ -735,7 +735,7 @@ xfs_ioctl(
!capable(CAP_SYS_ADMIN))
return -EPERM;
- return xfs_ioc_space(bdp, vp, filp, ioflags, cmd, arg);
+ return xfs_ioc_space(bdp, inode, filp, ioflags, cmd, arg);
case XFS_IOC_DIOINFO: {
struct dioattr da;
@@ -957,7 +957,7 @@ xfs_ioctl(
STATIC int
xfs_ioc_space(
bhv_desc_t *bdp,
- bhv_vnode_t *vp,
+ struct inode *inode,
struct file *filp,
int ioflags,
unsigned int cmd,
@@ -967,13 +967,13 @@ xfs_ioc_space(
int attr_flags = 0;
int error;
- if (vp->v_inode.i_flags & (S_IMMUTABLE|S_APPEND))
+ if (inode->i_flags & (S_IMMUTABLE|S_APPEND))
return -XFS_ERROR(EPERM);
if (!(filp->f_mode & FMODE_WRITE))
return -XFS_ERROR(EBADF);
- if (!VN_ISREG(vp))
+ if (!S_ISREG(inode->i_mode))
return -XFS_ERROR(EINVAL);
if (copy_from_user(&bf, arg, sizeof(bf)))
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
origin.patch
git-acpi.patch
git-block.patch
git-ieee1394.patch
git-libata-all.patch
git-mtd.patch
git-nfs.patch
xfs-remove-dir-check-in-xfs_link.patch
xfs-use-container_of-in-vn_from_inode.patch
xfs-pass-inode-to-xfs_ioc_space.patch
x86-dont-trigger-full-rebuild-via-config_mtrr.patch
dont-trigger-full-rebuild-via-config_x86_mce.patch
remove-config_parport_arc-drivers-parport-parport_arcc.patch
two-additions-to-linux-documentation-ioctl-numbertxt.patch
more-bug_on-conversion.patch
emu10k1-mark-midi_spinlock-as-used.patch
nbd-endian-annotations.patch
documentation-ioctl-messtxt-start-tree-wide-ioctl-registry.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
