xfs
[Top] [All Lists]

[PATCH 1/9] xfs: FSX_NONBLOCK is not used

To: xfs@xxxxxxxxxxx
Subject: [PATCH 1/9] xfs: FSX_NONBLOCK is not used
From: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Tue, 27 Jan 2015 14:14:38 +1100
Cc: iustin@xxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1422328486-24661-1-git-send-email-david@xxxxxxxxxxxxx>
References: <1422328486-24661-1-git-send-email-david@xxxxxxxxxxxxx>
From: Dave Chinner <dchinner@xxxxxxxxxx>

It is set if the filp is set ot non-blocking, but the flag is not
used anywhere. Hence we can kill it.

Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
---
 fs/xfs/xfs_ioctl.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 8810959..09325ff 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -1016,7 +1016,6 @@ xfs_diflags_to_linux(
 #define FSX_PROJID     1
 #define FSX_EXTSIZE    2
 #define FSX_XFLAGS     4
-#define FSX_NONBLOCK   8
 
 STATIC int
 xfs_ioctl_setattr(
@@ -1299,8 +1298,6 @@ xfs_ioc_fssetxattr(
                return -EFAULT;
 
        mask = FSX_XFLAGS | FSX_EXTSIZE | FSX_PROJID;
-       if (filp->f_flags & (O_NDELAY|O_NONBLOCK))
-               mask |= FSX_NONBLOCK;
 
        error = mnt_want_write_file(filp);
        if (error)
@@ -1343,8 +1340,6 @@ xfs_ioc_setxflags(
                return -EOPNOTSUPP;
 
        mask = FSX_XFLAGS;
-       if (filp->f_flags & (O_NDELAY|O_NONBLOCK))
-               mask |= FSX_NONBLOCK;
        fa.fsx_xflags = xfs_merge_ioc_xflags(flags, xfs_ip2xflags(ip));
 
        error = mnt_want_write_file(filp);
-- 
2.0.0

<Prev in Thread] Current Thread [Next in Thread>