diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-09 17:52:01 (GMT) |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-12 02:30:22 (GMT) |
| commit | 2ba48ce513c4e545318d22b138861d5876edf906 (patch) | |
| tree | 0e2a5130ead5c71f0b079b1acd620fba98f99256 /fs/xfs/xfs_file.c | |
| parent | 3309dd04cbcd2cdad168485af5cf3576b5051e49 (diff) | |
| download | linux-2ba48ce513c4e545318d22b138861d5876edf906.tar.xz | |
mirror O_APPEND and O_DIRECT into iocb->ki_flags
... avoiding write_iter/fcntl races.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/xfs/xfs_file.c')
| -rw-r--r-- | fs/xfs/xfs_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 28d1578..1f12ad0 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -279,7 +279,7 @@ xfs_file_read_iter( XFS_STATS_INC(xs_read_calls); - if (unlikely(file->f_flags & O_DIRECT)) + if (unlikely(iocb->ki_flags & IOCB_DIRECT)) ioflags |= XFS_IO_ISDIRECT; if (file->f_mode & FMODE_NOCMTIME) ioflags |= XFS_IO_INVIS; @@ -804,7 +804,7 @@ xfs_file_write_iter( if (XFS_FORCED_SHUTDOWN(ip->i_mount)) return -EIO; - if (unlikely(file->f_flags & O_DIRECT)) + if (unlikely(iocb->ki_flags & IOCB_DIRECT)) ret = xfs_file_dio_aio_write(iocb, from); else ret = xfs_file_buffered_aio_write(iocb, from); |