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.
Unified · Split
| @@ -965,15 +965,20 @@ static void gfs2_write_unlock(struct inode *inode) · 964 unmodified lines | |||
| 965 | gfs2_glock_dq_uninit(&ip->i_gh); | 965 | gfs2_glock_dq_uninit(&ip->i_gh); |
| 966 | } | 966 | } |
| 967 | 967 | ||
| 968 | static void gfs2_iomap_journaled_page_done(struct inode *inode, loff_t pos, | 968 | static void gfs2_iomap_page_done(struct inode *inode, loff_t pos, |
| 969 | unsigned copied, struct page *page, | 969 | unsigned copied, struct page *page, |
| 970 | struct iomap *iomap) | 970 | struct iomap *iomap) |
| 971 | { | 971 | { |
| 972 | struct gfs2_inode *ip = GFS2_I(inode); | 972 | struct gfs2_inode *ip = GFS2_I(inode); |
| 973 | 973 | ||
| 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); | ||
| 975 | } | 976 | } |
| 976 | 977 | ||
| 978 | static const struct iomap_page_ops gfs2_iomap_page_ops = { | ||
| 979 | .page_done = gfs2_iomap_page_done, | ||
| 980 | }; | ||
| 981 | |||
| 977 | static int gfs2_iomap_begin_write(struct inode *inode, loff_t pos, | 982 | static int gfs2_iomap_begin_write(struct inode *inode, loff_t pos, |
| 978 | loff_t length, unsigned flags, | 983 | loff_t length, unsigned flags, |
| 979 | struct iomap *iomap, | 984 | struct iomap *iomap, |
| @@ -1051,7 +1056,7 @@ static int gfs2_iomap_begin_write(struct inode *inode, loff_t pos, · 71 unmodified lines | |||
| 1051 | } | 1056 | } |
| 1052 | } | 1057 | } |
| 1053 | if (!gfs2_is_stuffed(ip) && gfs2_is_jdata(ip)) | 1058 | 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; |
| 1055 | return 0; | 1060 | return 0; |
| 1056 | 1061 | ||
| 1057 | out_trans_end: | 1062 | out_trans_end: |
| @@ -657,6 +657,7 @@ static int · 656 unmodified lines | |||
| 657 | iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags, | 657 | iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags, |
| 658 | struct page **pagep, struct iomap *iomap) | 658 | struct page **pagep, struct iomap *iomap) |
| 659 | { | 659 | { |
| 660 | const struct iomap_page_ops *page_ops = iomap->page_ops; | ||
| 660 | pgoff_t index = pos >> PAGE_SHIFT; | 661 | pgoff_t index = pos >> PAGE_SHIFT; |
| 661 | struct page *page; | 662 | struct page *page; |
| 662 | int status = 0; | 663 | int status = 0; |
| @@ -666,9 +667,17 @@ iomap_write_begin(struct inode *inode, loff_t pos, unsigned len, unsigned flags, · 3 unmodified lines | |||
| 666 | if (fatal_signal_pending(current)) | 667 | if (fatal_signal_pending(current)) |
| 667 | return -EINTR; | 668 | return -EINTR; |
| 668 | 669 | ||
| 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 | |||
| 669 | page = grab_cache_page_write_begin(inode->i_mapping, index, flags); | 676 | page = grab_cache_page_write_begin(inode->i_mapping, index, flags); |
| 670 | if (!page) | 677 | if (!page) { |
| 671 | return -ENOMEM; | 678 | status = -ENOMEM; |
| 679 | goto out_no_page; | ||
| 680 | } | ||
| 672 | 681 | ||
| 673 | if (iomap->type == IOMAP_INLINE) | 682 | if (iomap->type == IOMAP_INLINE) |
| 674 | iomap_read_inline_data(inode, page, iomap); | 683 | 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 | |||
| 676 | status = __block_write_begin_int(page, pos, len, NULL, iomap); | 685 | status = __block_write_begin_int(page, pos, len, NULL, iomap); |
| 677 | else | 686 | else |
| 678 | status = __iomap_write_begin(inode, pos, len, page, iomap); | 687 | status = __iomap_write_begin(inode, pos, len, page, iomap); |
| 679 | if (unlikely(status)) { | ||
| 680 | unlock_page(page); | ||
| 681 | put_page(page); | ||
| 682 | page = NULL; | ||
| 683 | 688 | ||
| 684 | iomap_write_failed(inode, pos, len); | 689 | if (unlikely(status)) |
| 685 | } | 690 | goto out_unlock; |
| 686 | 691 | ||
| 687 | *pagep = page; | 692 | *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); | ||
| 688 | return status; | 703 | return status; |
| 689 | } | 704 | } |
| 690 | 705 | ||
| @@ -758,6 +773,7 @@ static int · 67 unmodified lines | |||
| 758 | iomap_write_end(struct inode *inode, loff_t pos, unsigned len, | 773 | iomap_write_end(struct inode *inode, loff_t pos, unsigned len, |
| 759 | unsigned copied, struct page *page, struct iomap *iomap) | 774 | unsigned copied, struct page *page, struct iomap *iomap) |
| 760 | { | 775 | { |
| 776 | const struct iomap_page_ops *page_ops = iomap->page_ops; | ||
| 761 | int ret; | 777 | int ret; |
| 762 | 778 | ||
| 763 | if (iomap->type == IOMAP_INLINE) { | 779 | if (iomap->type == IOMAP_INLINE) { |
| @@ -770,8 +786,8 @@ iomap_write_end(struct inode *inode, loff_t pos, unsigned len, · 6 unmodified lines | |||
| 770 | } | 786 | } |
| 771 | 787 | ||
| 772 | __generic_write_end(inode, pos, ret, page); | 788 | __generic_write_end(inode, pos, ret, page); |
| 773 | if (iomap->page_done) | 789 | if (page_ops && page_ops->page_done) |
| 774 | iomap->page_done(inode, pos, copied, page, iomap); | 790 | page_ops->page_done(inode, pos, copied, page, iomap); |
| 775 | put_page(page); | 791 | put_page(page); |
| 776 | 792 | ||
| 777 | if (ret < len) | 793 | if (ret < len) |
| @@ -53,6 +53,8 @@ struct vm_fault; · 52 unmodified lines | |||
| 53 | */ | 53 | */ |
| 54 | #define IOMAP_NULL_ADDR -1ULL /* addr is not valid */ | 54 | #define IOMAP_NULL_ADDR -1ULL /* addr is not valid */ |
| 55 | 55 | ||
| 56 | struct iomap_page_ops; | ||
| 57 | |||
| 56 | struct iomap { | 58 | struct iomap { |
| 57 | u64 addr; /* disk offset of mapping, bytes */ | 59 | u64 addr; /* disk offset of mapping, bytes */ |
| 58 | loff_t offset; /* file offset of mapping, bytes */ | 60 | loff_t offset; /* file offset of mapping, bytes */ |
| @@ -63,12 +65,22 @@ struct iomap { · 4 unmodified lines | |||
| 63 | struct dax_device *dax_dev; /* dax_dev for dax operations */ | 65 | struct dax_device *dax_dev; /* dax_dev for dax operations */ |
| 64 | void *inline_data; | 66 | void *inline_data; |
| 65 | void *private; /* filesystem private */ | 67 | void *private; /* filesystem private */ |
| 68 | const struct iomap_page_ops *page_ops; | ||
| 69 | }; | ||
| 66 | 70 | ||
| 67 | /* | 71 | /* |
| 68 | * Called when finished processing a page in the mapping returned in | 72 | * When a filesystem sets page_ops in an iomap mapping it returns, page_prepare |
| 69 | * this iomap. At least for now this is only supported in the buffered | 73 | * and page_done will be called for each page written to. This only applies to |
| 70 | * write path. | 74 | * buffered writes as unbuffered writes will not typically have pages |
| 71 | */ | 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); | ||
| 72 | void (*page_done)(struct inode *inode, loff_t pos, unsigned copied, | 84 | void (*page_done)(struct inode *inode, loff_t pos, unsigned copied, |
| 73 | struct page *page, struct iomap *iomap); | 85 | struct page *page, struct iomap *iomap); |
| 74 | }; | 86 | }; |