Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
fs/xfs/xfs_ioctl.c | 3 ---
fs/xfs/xfs_vnodeops.h | 1 -
2 files changed, 4 deletions(-)
Index: xfs/fs/xfs/xfs_ioctl.c
===================================================================
--- xfs.orig/fs/xfs/xfs_ioctl.c 2012-12-06 16:04:50.908778675 +0100
+++ xfs/fs/xfs/xfs_ioctl.c 2012-12-06 16:05:13.272111942 +0100
@@ -633,9 +633,6 @@ xfs_ioc_space(
if (!S_ISREG(inode->i_mode))
return -XFS_ERROR(EINVAL);
- if (filp->f_flags & (O_NDELAY|O_NONBLOCK))
- attr_flags |= XFS_ATTR_NONBLOCK;
-
if (filp->f_flags & O_DSYNC)
attr_flags |= XFS_ATTR_SYNC;
Index: xfs/fs/xfs/xfs_vnodeops.h
===================================================================
--- xfs.orig/fs/xfs/xfs_vnodeops.h 2012-12-06 16:04:50.908778675 +0100
+++ xfs/fs/xfs/xfs_vnodeops.h 2012-12-06 16:05:18.452111928 +0100
@@ -15,7 +15,6 @@ struct xfs_inode;
int xfs_setattr_nonsize(struct xfs_inode *ip, struct iattr *vap, int flags);
int xfs_setattr_size(struct xfs_inode *ip, struct iattr *vap, int flags);
#define XFS_ATTR_DMI 0x01 /* invocation from a DMI
function */
-#define XFS_ATTR_NONBLOCK 0x02 /* return EAGAIN if operation
would block */
#define XFS_ATTR_NOLOCK 0x04 /* Don't grab any conflicting
locks */
#define XFS_ATTR_NOACL 0x08 /* Don't call xfs_acl_chmod */
#define XFS_ATTR_SYNC 0x10 /* synchronous operation required */
|