| Message ID | 20170414120257.8932-5-rgoldwyn@suse.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Looks fine,
Reviewed-by: Christoph Hellwig <hch@lst.de>
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri 14-04-17 07:02:53, Goldwyn Rodrigues wrote: > From: Goldwyn Rodrigues <rgoldwyn@suse.com> > > IOCB_NOWAIT translates to IOMAP_NOWAIT for iomaps. > This is used by XFS in the XFS patch. Goldwyn, the patch is missing your Signed-off-by... Honza > --- > fs/iomap.c | 2 ++ > include/linux/iomap.h | 1 + > 2 files changed, 3 insertions(+) > > diff --git a/fs/iomap.c b/fs/iomap.c > index 141c3cd55a8b..d1c81753d411 100644 > --- a/fs/iomap.c > +++ b/fs/iomap.c > @@ -885,6 +885,8 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, > } else { > dio->flags |= IOMAP_DIO_WRITE; > flags |= IOMAP_WRITE; > + if (iocb->ki_flags & IOCB_NOWAIT) > + flags |= IOMAP_NOWAIT; > } > > if (mapping->nrpages) { > diff --git a/include/linux/iomap.h b/include/linux/iomap.h > index 7291810067eb..53f6af89c625 100644 > --- a/include/linux/iomap.h > +++ b/include/linux/iomap.h > @@ -51,6 +51,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 { > /* > -- > 2.12.0 >
diff --git a/fs/iomap.c b/fs/iomap.c index 141c3cd55a8b..d1c81753d411 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -885,6 +885,8 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, } else { dio->flags |= IOMAP_DIO_WRITE; flags |= IOMAP_WRITE; + if (iocb->ki_flags & IOCB_NOWAIT) + flags |= IOMAP_NOWAIT; } if (mapping->nrpages) { diff --git a/include/linux/iomap.h b/include/linux/iomap.h index 7291810067eb..53f6af89c625 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -51,6 +51,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 { /*
From: Goldwyn Rodrigues <rgoldwyn@suse.com> IOCB_NOWAIT translates to IOMAP_NOWAIT for iomaps. This is used by XFS in the XFS patch. --- fs/iomap.c | 2 ++ include/linux/iomap.h | 1 + 2 files changed, 3 insertions(+)