hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[XFS] pass inode to xfs_ioc_space(), simplify some code. There is trivial 

"inode => vnode => inode" conversion, but only flags and mode of final
inode are looked at. Pass original inode instead.

SGI-PV: 904196
SGI-Modid: xfs-linux-melb:xfs-kern:26395a

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
This commit is contained in:
Alexey Dobriyan 2006-09-28 10:52:04 +10:00 committed by Tim Shimmin
parent a77c64c1a6
commit f37ea14969
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/xfs/linux-2.6/xfs_ioctl.c
View File

@ -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)))