OSDN Git Service

xfs: FSX_NONBLOCK is not used
authorDave Chinner <dchinner@redhat.com>
Sun, 1 Feb 2015 23:14:04 +0000 (10:14 +1100)
committerDave Chinner <david@fromorbit.com>
Sun, 1 Feb 2015 23:14:04 +0000 (10:14 +1100)
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@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
fs/xfs/xfs_ioctl.c

index a183198..0c0e74f 100644 (file)
@@ -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);