History

iomap: Add a page_prepare callback

Move the page_done callback into a separate iomap_page_ops structure and add a page_prepare calback to be called before the next page is written to. In gfs2, we'll want to start a transaction in page_prepare and end it in page_done. Other filesystems that implement data journaling will require the same kind of mechanism.

Andreas Gruenbacher committed 7 years ago

Commit df0db3e1 parent 7a77dad3 files · +53 −20Browse files

Unified · Split

3 files
  1. fs/gfs2/bmap.c +10 −5
  2. fs/iomap.c +26 −10
  3. include/linux/iomap.h +17 −5
fs/gfs2/bmap.c+10−5
@@ -965,15 +965,20 @@ static void gfs2_write_unlock(struct inode *inode) · 964 unmodified lines
965965 gfs2_glock_dq_uninit(&ip->i_gh);
966966 }
967967
968−static void gfs2_iomap_journaled_page_done(struct inode *inode, loff_t pos,
969− unsigned copied, struct page *page,
970− struct iomap *iomap)
968+static void gfs2_iomap_page_done(struct inode *inode, loff_t pos,
969+ unsigned copied, struct page *page,
970+ struct iomap *iomap)
971971 {
972972 struct gfs2_inode *ip = GFS2_I(inode);
973973
974− gfs2_page_add_databufs(ip, page, offset_in_page(pos), copied);
974+ if (page)
975+ gfs2_page_add_databufs(ip, page, offset_in_page(pos), copied);
975976 }
976977
978+static const struct iomap_page_ops gfs2_iomap_page_ops = {
979+ .page_done = gfs2_iomap_page_done,
980+};
981+
977982 static int gfs2_iomap_begin_write(struct inode *inode, loff_t pos,
978983 loff_t length, unsigned flags,
979984 struct iomap *iomap,
@@ -1051,7 +1056,7 @@ static int gfs2_iomap_begin_write(struct inode *inode, loff_t pos, · 71 unmodified lines
10511056 }
10521057 }
10531058 if (!gfs2_is_stuffed(ip) && gfs2_is_jdata(ip))
1054− iomap->page_done = gfs2_iomap_journaled_page_done;
1059+ iomap->page_ops = &gfs2_iomap_page_ops;
10551060 return 0;
10561061
10571062 out_trans_end:
fs/iomap.c+26−10
@@ -657,6 +657,7 @@ static int · 656 unmodified lines
657657 iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags,
658658 struct page **pagep, struct iomap *iomap)
659659 {
660+ const struct iomap_page_ops *page_ops = iomap->page_ops;
660661 pgoff_t index = pos >> PAGE_SHIFT;
661662 struct page *page;
662663 int status = 0;
@@ -666,9 +667,17 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags, · 3 unmodified lines
666667 if (fatal_signal_pending(current))
667668 return -EINTR;
668669
670+ if (page_ops && page_ops->page_prepare) {
671+ status = page_ops->page_prepare(inode, pos, len, iomap);
672+ if (status)
673+ return status;
674+ }
675+
669676 page = grab_cache_page_write_begin(inode->i_mapping, index, flags);
670− if (!page)
671− return -ENOMEM;
677+ if (!page) {
678+ status = -ENOMEM;
679+ goto out_no_page;
680+ }
672681
673682 if (iomap->type == IOMAP_INLINE)
674683 iomap_read_inline_data(inode, page, iomap);
@@ -676,15 +685,21 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags, · 1 unmodified line
676685 status = __block_write_begin_int(page, pos, len, NULL, iomap);
677686 else
678687 status = __iomap_write_begin(inode, pos, len, page, iomap);
679− if (unlikely(status)) {
680− unlock_page(page);
681− put_page(page);
682− page = NULL;
683688
684− iomap_write_failed(inode, pos, len);
685− }
689+ if (unlikely(status))
690+ goto out_unlock;
686691
687692 *pagep = page;
693+ return 0;
694+
695+out_unlock:
696+ unlock_page(page);
697+ put_page(page);
698+ iomap_write_failed(inode, pos, len);
699+
700+out_no_page:
701+ if (page_ops && page_ops->page_done)
702+ page_ops->page_done(inode, pos, 0, NULL, iomap);
688703 return status;
689704 }
690705
@@ -758,6 +773,7 @@ static int · 67 unmodified lines
758773 iomap_write_end(struct inode *inode, loff_t pos, unsigned len,
759774 unsigned copied, struct page *page, struct iomap *iomap)
760775 {
776+ const struct iomap_page_ops *page_ops = iomap->page_ops;
761777 int ret;
762778
763779 if (iomap->type == IOMAP_INLINE) {
@@ -770,8 +786,8 @@ iomap_write_end(struct inode *inode, loff_t pos, unsigned len, · 6 unmodified lines
770786 }
771787
772788 __generic_write_end(inode, pos, ret, page);
773− if (iomap->page_done)
774− iomap->page_done(inode, pos, copied, page, iomap);
789+ if (page_ops && page_ops->page_done)
790+ page_ops->page_done(inode, pos, copied, page, iomap);
775791 put_page(page);
776792
777793 if (ret < len)
include/linux/iomap.h+17−5
@@ -53,6 +53,8 @@ struct vm_fault; · 52 unmodified lines
5353 */
5454 #define IOMAP_NULL_ADDR -1ULL /* addr is not valid */
5555
56+struct iomap_page_ops;
57+
5658 struct iomap {
5759 u64 addr; /* disk offset of mapping, bytes */
5860 loff_t offset; /* file offset of mapping, bytes */
@@ -63,12 +65,22 @@ struct iomap { · 4 unmodified lines
6365 struct dax_device *dax_dev; /* dax_dev for dax operations */
6466 void *inline_data;
6567 void *private; /* filesystem private */
68+ const struct iomap_page_ops *page_ops;
69+};
6670
67− /*
68− * Called when finished processing a page in the mapping returned in
69− * this iomap. At least for now this is only supported in the buffered
70− * write path.
71− */
71+/*
72+ * When a filesystem sets page_ops in an iomap mapping it returns, page_prepare
73+ * and page_done will be called for each page written to. This only applies to
74+ * buffered writes as unbuffered writes will not typically have pages
75+ * associated with them.
76+ *
77+ * When page_prepare succeeds, page_done will always be called to do any
78+ * cleanup work necessary. In that page_done call, @page will be NULL if the
79+ * associated page could not be obtained.
80+ */
81+struct iomap_page_ops {
82+ int (*page_prepare)(struct inode *inode, loff_t pos, unsigned len,
83+ struct iomap *iomap);
7284 void (*page_done)(struct inode *inode, loff_t pos, unsigned copied,
7385 struct page *page, struct iomap *iomap);
7486 };

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t