[PATCH 2/5] xfs: remove the unused XFS_ATTR_NONBLOCK flag

Christoph Hellwig
2013-10-12T07:56:42Z

[-- Attachment #1: xfs-kill-XFS_ATTR_NONBLOCK --]
[-- Type: text/plain, Size: 1397 bytes --]

Signed-off-by: Christoph Hellwig <hch@lst.de>

---
fs/xfs/xfs_ioctl.c | 3 ---
fs/xfs/xfs_iops.h | 1 -
2 files changed, 4 deletions(-)

Index: xfs/fs/xfs/xfs_ioctl.c
===================================================================
--- xfs.orig/fs/xfs/xfs_ioctl.c 2013-09-12 18:43:35.480015650 +0200
+++ xfs/fs/xfs/xfs_ioctl.c 2013-10-01 20:16:53.240138969 +0200
@@ -661,9 +661,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_iops.h
===================================================================
--- xfs.orig/fs/xfs/xfs_iops.h 2013-08-13 15:21:06.716303663 +0200
+++ xfs/fs/xfs/xfs_iops.h 2013-10-01 20:17:18.440139568 +0200
@@ -31,7 +31,6 @@ extern void xfs_setup_inode(struct xfs_i
* Internal setattr interfaces.
*/
#define XFS_ATTR_DMI 0x01 /* invocation from a DMI function */
-#define XFS_ATTR_NONBLOCK 0x02 /* return EAGAIN if op 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 */