diff options
author | Dave Chinner <dchinner@redhat.com> | 2015-02-01 18:14:04 -0500 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2015-02-01 18:14:04 -0500 |
commit | 817b6c480e330a5325ed9acb0cef8143923a52de (patch) | |
tree | b29f5c4c0963cb832c687ed8c268dbb252c4beff | |
parent | 074e427ba7f7398427e4f8e2aec071edcc509673 (diff) |
xfs: FSX_NONBLOCK is not used
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>
-rw-r--r-- | fs/xfs/xfs_ioctl.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index a1831980a68e..0c0e74f314a6 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c | |||
@@ -1016,7 +1016,6 @@ xfs_diflags_to_linux( | |||
1016 | #define FSX_PROJID 1 | 1016 | #define FSX_PROJID 1 |
1017 | #define FSX_EXTSIZE 2 | 1017 | #define FSX_EXTSIZE 2 |
1018 | #define FSX_XFLAGS 4 | 1018 | #define FSX_XFLAGS 4 |
1019 | #define FSX_NONBLOCK 8 | ||
1020 | 1019 | ||
1021 | STATIC int | 1020 | STATIC int |
1022 | xfs_ioctl_setattr( | 1021 | xfs_ioctl_setattr( |
@@ -1299,8 +1298,6 @@ xfs_ioc_fssetxattr( | |||
1299 | return -EFAULT; | 1298 | return -EFAULT; |
1300 | 1299 | ||
1301 | mask = FSX_XFLAGS | FSX_EXTSIZE | FSX_PROJID; | 1300 | mask = FSX_XFLAGS | FSX_EXTSIZE | FSX_PROJID; |
1302 | if (filp->f_flags & (O_NDELAY|O_NONBLOCK)) | ||
1303 | mask |= FSX_NONBLOCK; | ||
1304 | 1301 | ||
1305 | error = mnt_want_write_file(filp); | 1302 | error = mnt_want_write_file(filp); |
1306 | if (error) | 1303 | if (error) |
@@ -1343,8 +1340,6 @@ xfs_ioc_setxflags( | |||
1343 | return -EOPNOTSUPP; | 1340 | return -EOPNOTSUPP; |
1344 | 1341 | ||
1345 | mask = FSX_XFLAGS; | 1342 | mask = FSX_XFLAGS; |
1346 | if (filp->f_flags & (O_NDELAY|O_NONBLOCK)) | ||
1347 | mask |= FSX_NONBLOCK; | ||
1348 | fa.fsx_xflags = xfs_merge_ioc_xflags(flags, xfs_ip2xflags(ip)); | 1343 | fa.fsx_xflags = xfs_merge_ioc_xflags(flags, xfs_ip2xflags(ip)); |
1349 | 1344 | ||
1350 | error = mnt_want_write_file(filp); | 1345 | error = mnt_want_write_file(filp); |