On Mon, Jun 05, 2023 at 04:25:04PM +0530, Ritesh Harjani (IBM) wrote:
> This patch moves iomap_write_delalloc_punch() out of
> iomap_write_delalloc_scan(). No functionality change in this patch.
>
> Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@xxxxxxxxx>
Seems fine on its own...
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--D
> ---
> fs/iomap/buffered-io.c | 54 ++++++++++++++++++++++++++----------------
> 1 file changed, 34 insertions(+), 20 deletions(-)
>
> diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
> index 136f57ccd0be..f55a339f99ec 100644
> --- a/fs/iomap/buffered-io.c
> +++ b/fs/iomap/buffered-io.c
> @@ -894,6 +894,33 @@ iomap_file_buffered_write(struct kiocb *iocb, struct iov_iter *i,
> }
> EXPORT_SYMBOL_GPL(iomap_file_buffered_write);
>
> +static int iomap_write_delalloc_punch(struct inode *inode, struct folio *folio,
> + loff_t *punch_start_byte, loff_t start_byte, loff_t end_byte,
> + int (*punch)(struct inode *inode, loff_t offset, loff_t length))
> +{
> + int ret = 0;
> +
> + if (!folio_test_dirty(folio))
> + return ret;
> +
> + /* if dirty, punch up to offset */
> + if (start_byte > *punch_start_byte) {
> + ret = punch(inode, *punch_start_byte,
> + start_byte - *punch_start_byte);
> + if (ret)
> + goto out;
> + }
> + /*
> + * Make sure the next punch start is correctly bound to
> + * the end of this data range, not the end of the folio.
> + */
> + *punch_start_byte = min_t(loff_t, end_byte,
> + folio_next_index(folio) << PAGE_SHIFT);
> +
> +out:
> + return ret;
> +}
> +
> /*
> * Scan the data range passed to us for dirty page cache folios. If we find a
> * dirty folio, punch out the preceeding range and update the offset from which
> @@ -917,6 +944,7 @@ static int iomap_write_delalloc_scan(struct inode *inode,
> {
> while (start_byte < end_byte) {
> struct folio *folio;
> + int ret;
>
> /* grab locked page */
> folio = filemap_lock_folio(inode->i_mapping,
> @@ -927,26 +955,12 @@ static int iomap_write_delalloc_scan(struct inode *inode,
> continue;
> }
>
> - /* if dirty, punch up to offset */
> - if (folio_test_dirty(folio)) {
> - if (start_byte > *punch_start_byte) {
> - int error;
> -
> - error = punch(inode, *punch_start_byte,
> - start_byte - *punch_start_byte);
> - if (error) {
> - folio_unlock(folio);
> - folio_put(folio);
> - return error;
> - }
> - }
> -
> - /*
> - * Make sure the next punch start is correctly bound to
> - * the end of this data range, not the end of the folio.
> - */
> - *punch_start_byte = min_t(loff_t, end_byte,
> - folio_next_index(folio) << PAGE_SHIFT);
> + ret = iomap_write_delalloc_punch(inode, folio, punch_start_byte,
> + start_byte, end_byte, punch);
> + if (ret) {
> + folio_unlock(folio);
> + folio_put(folio);
> + return ret;
> }
>
> /* move offset to start of next folio in range */
> --
> 2.40.1
>
