diff options
| author | Goldwyn Rodrigues <rgoldwyn@suse.com> | 2017-06-20 07:05:45 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-06-20 07:12:03 -0600 |
| commit | a38d1243704f501a4c42de1db1062ff6eba83453 (patch) | |
| tree | a5dfc333eccc3ecb99b4bf5de17436215121c835 | |
| parent | 6be96d3ad34a124450028dabba43f07fe1d0c86d (diff) | |
| download | linux-stable-a38d1243704f501a4c42de1db1062ff6eba83453.tar.gz linux-stable-a38d1243704f501a4c42de1db1062ff6eba83453.tar.bz2 linux-stable-a38d1243704f501a4c42de1db1062ff6eba83453.zip | |
fs: Introduce IOMAP_NOWAIT
IOCB_NOWAIT translates to IOMAP_NOWAIT for iomaps.
This is used by XFS in the XFS patch.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | fs/iomap.c | 8 | ||||
| -rw-r--r-- | include/linux/iomap.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/fs/iomap.c b/fs/iomap.c index 18f2f2b8ba2c..c71a64b97fba 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -881,6 +881,14 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, flags |= IOMAP_WRITE; } + if (iocb->ki_flags & IOCB_NOWAIT) { + if (filemap_range_has_page(mapping, start, end)) { + ret = -EAGAIN; + goto out_free_dio; + } + flags |= IOMAP_NOWAIT; + } + ret = filemap_write_and_wait_range(mapping, start, end); if (ret) goto out_free_dio; diff --git a/include/linux/iomap.h b/include/linux/iomap.h index f753e788da31..69f4e9470084 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -52,6 +52,7 @@ struct iomap { #define IOMAP_REPORT (1 << 2) /* report extent status, e.g. FIEMAP */ #define IOMAP_FAULT (1 << 3) /* mapping for page fault */ #define IOMAP_DIRECT (1 << 4) /* direct I/O */ +#define IOMAP_NOWAIT (1 << 5) /* Don't wait for writeback */ struct iomap_ops { /* |