diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2018-07-25 00:06:59 +0200 |
|---|---|---|
| committer | Andreas Gruenbacher <agruenba@redhat.com> | 2018-07-25 00:08:20 +0200 |
| commit | 0ed91eca1130e6c0fe66e01fa6ea92965e81900c (patch) | |
| tree | 62c03dedbdceb8d9105c7e29490e777c4037b398 /include/linux | |
| parent | c25892827c7996eb19ca2a5b1cf596218122e994 (diff) | |
| parent | 806a1477b10a153cd01ee7ccba8ca2492df3e0b2 (diff) | |
| download | cachepc-linux-0ed91eca1130e6c0fe66e01fa6ea92965e81900c.tar.gz cachepc-linux-0ed91eca1130e6c0fe66e01fa6ea92965e81900c.zip | |
Merge branch 'iomap-4.19-merge' into linux-gfs2/for-next
Merge xfs branch 'iomap-4.19-merge' into linux-gfs2/for-next. This
brings in readpage and direct I/O support for inline data.
The IOMAP_F_BUFFER_HEAD flag introduced in commit "iomap: add initial
support for writes without buffer heads" needs to be set for gfs2 as
well, so do that in the merge.
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/iomap.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/iomap.h b/include/linux/iomap.h index 1f36523d448a..5eb9ca8d7ce5 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@ -30,6 +30,7 @@ struct vm_fault; */ #define IOMAP_F_NEW 0x01 /* blocks have been newly allocated */ #define IOMAP_F_DIRTY 0x02 /* uncommitted metadata */ +#define IOMAP_F_BUFFER_HEAD 0x04 /* file system requires buffer heads */ /* * Flags that only need to be reported for IOMAP_REPORT requests: @@ -99,6 +100,10 @@ struct iomap_ops { ssize_t iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *from, const struct iomap_ops *ops); +int iomap_readpage(struct page *page, const struct iomap_ops *ops); +int iomap_readpages(struct address_space *mapping, struct list_head *pages, + unsigned nr_pages, const struct iomap_ops *ops); +int iomap_set_page_dirty(struct page *page); int iomap_file_dirty(struct inode *inode, loff_t pos, loff_t len, const struct iomap_ops *ops); int iomap_zero_range(struct inode *inode, loff_t pos, loff_t len, |