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