All of lore.kernel.org
 help / color / mirror / Atom feed
From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v3 09/49] btrfs: extent_io: remove the forward declaration and rename __process_pages_contig
Date: Wed, 30 Sep 2020 09:54:59 +0800	[thread overview]
Message-ID: <20200930015539.48867-10-wqu@suse.com> (raw)
In-Reply-To: <20200930015539.48867-1-wqu@suse.com>

There is no need to do forward declaration for __process_pages_contig(),
so move it before it get first called.

Since we are here, also remove the "__" prefix since there is no special
meaning for it.

Signed-off-by: Qu Wenruo <wqu@suse.com>
---
 fs/btrfs/extent_io.c | 180 +++++++++++++++++++++++--------------------
 1 file changed, 95 insertions(+), 85 deletions(-)

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 02c3518afa82..9f46d7f17a9c 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1810,10 +1810,98 @@ bool btrfs_find_delalloc_range(struct extent_io_tree *tree, u64 *start,
 	return found;
 }
 
-static int __process_pages_contig(struct address_space *mapping,
-				  struct page *locked_page,
-				  pgoff_t start_index, pgoff_t end_index,
-				  unsigned long page_ops, pgoff_t *index_ret);
+/*
+ * A helper to update contiguous pages status according to @page_ops.
+ *
+ * @mapping:		The address space of the pages
+ * @locked_page:	The already locked page. Mostly for inline extent
+ * 			handling
+ * @start_index:	The start page index.
+ * @end_inde:		The last page index.
+ * @pages_opts:		The operations to be done
+ * @index_ret:		The last handled page index (for error case)
+ *
+ * Return 0 if every page is handled properly.
+ * Return <0 if something wrong happened, and update @index_ret.
+ */
+static int process_pages_contig(struct address_space *mapping,
+				struct page *locked_page,
+				pgoff_t start_index, pgoff_t end_index,
+				unsigned long page_ops, pgoff_t *index_ret)
+{
+	unsigned long nr_pages = end_index - start_index + 1;
+	unsigned long pages_locked = 0;
+	pgoff_t index = start_index;
+	struct page *pages[16];
+	unsigned ret;
+	int err = 0;
+	int i;
+
+	if (page_ops & PAGE_LOCK) {
+		ASSERT(page_ops == PAGE_LOCK);
+		ASSERT(index_ret && *index_ret == start_index);
+	}
+
+	if ((page_ops & PAGE_SET_ERROR) && nr_pages > 0)
+		mapping_set_error(mapping, -EIO);
+
+	while (nr_pages > 0) {
+		ret = find_get_pages_contig(mapping, index,
+				     min_t(unsigned long,
+				     nr_pages, ARRAY_SIZE(pages)), pages);
+		if (ret == 0) {
+			/*
+			 * Only if we're going to lock these pages,
+			 * can we find nothing at @index.
+			 */
+			ASSERT(page_ops & PAGE_LOCK);
+			err = -EAGAIN;
+			goto out;
+		}
+
+		for (i = 0; i < ret; i++) {
+			if (page_ops & PAGE_SET_PRIVATE2)
+				SetPagePrivate2(pages[i]);
+
+			if (locked_page && pages[i] == locked_page) {
+				put_page(pages[i]);
+				pages_locked++;
+				continue;
+			}
+			if (page_ops & PAGE_CLEAR_DIRTY)
+				clear_page_dirty_for_io(pages[i]);
+			if (page_ops & PAGE_SET_WRITEBACK)
+				set_page_writeback(pages[i]);
+			if (page_ops & PAGE_SET_ERROR)
+				SetPageError(pages[i]);
+			if (page_ops & PAGE_END_WRITEBACK)
+				end_page_writeback(pages[i]);
+			if (page_ops & PAGE_UNLOCK)
+				unlock_page(pages[i]);
+			if (page_ops & PAGE_LOCK) {
+				lock_page(pages[i]);
+				if (!PageDirty(pages[i]) ||
+				    pages[i]->mapping != mapping) {
+					unlock_page(pages[i]);
+					for (; i < ret; i++)
+						put_page(pages[i]);
+					err = -EAGAIN;
+					goto out;
+				}
+			}
+			put_page(pages[i]);
+			pages_locked++;
+		}
+		nr_pages -= ret;
+		index += ret;
+		cond_resched();
+	}
+out:
+	if (err && index_ret)
+		*index_ret = start_index + pages_locked - 1;
+	return err;
+}
+
 
 static noinline void __unlock_for_delalloc(struct inode *inode,
 					   struct page *locked_page,
@@ -1826,7 +1914,7 @@ static noinline void __unlock_for_delalloc(struct inode *inode,
 	if (index == locked_page->index && end_index == index)
 		return;
 
-	__process_pages_contig(inode->i_mapping, locked_page, index, end_index,
+	process_pages_contig(inode->i_mapping, locked_page, index, end_index,
 			       PAGE_UNLOCK, NULL);
 }
 
@@ -1844,7 +1932,7 @@ static noinline int lock_delalloc_pages(struct inode *inode,
 	if (index == locked_page->index && index == end_index)
 		return 0;
 
-	ret = __process_pages_contig(inode->i_mapping, locked_page, index,
+	ret = process_pages_contig(inode->i_mapping, locked_page, index,
 				     end_index, PAGE_LOCK, &index_ret);
 	if (ret == -EAGAIN)
 		__unlock_for_delalloc(inode, locked_page, delalloc_start,
@@ -1941,84 +2029,6 @@ noinline_for_stack bool find_lock_delalloc_range(struct inode *inode,
 	return found;
 }
 
-static int __process_pages_contig(struct address_space *mapping,
-				  struct page *locked_page,
-				  pgoff_t start_index, pgoff_t end_index,
-				  unsigned long page_ops, pgoff_t *index_ret)
-{
-	unsigned long nr_pages = end_index - start_index + 1;
-	unsigned long pages_locked = 0;
-	pgoff_t index = start_index;
-	struct page *pages[16];
-	unsigned ret;
-	int err = 0;
-	int i;
-
-	if (page_ops & PAGE_LOCK) {
-		ASSERT(page_ops == PAGE_LOCK);
-		ASSERT(index_ret && *index_ret == start_index);
-	}
-
-	if ((page_ops & PAGE_SET_ERROR) && nr_pages > 0)
-		mapping_set_error(mapping, -EIO);
-
-	while (nr_pages > 0) {
-		ret = find_get_pages_contig(mapping, index,
-				     min_t(unsigned long,
-				     nr_pages, ARRAY_SIZE(pages)), pages);
-		if (ret == 0) {
-			/*
-			 * Only if we're going to lock these pages,
-			 * can we find nothing at @index.
-			 */
-			ASSERT(page_ops & PAGE_LOCK);
-			err = -EAGAIN;
-			goto out;
-		}
-
-		for (i = 0; i < ret; i++) {
-			if (page_ops & PAGE_SET_PRIVATE2)
-				SetPagePrivate2(pages[i]);
-
-			if (locked_page && pages[i] == locked_page) {
-				put_page(pages[i]);
-				pages_locked++;
-				continue;
-			}
-			if (page_ops & PAGE_CLEAR_DIRTY)
-				clear_page_dirty_for_io(pages[i]);
-			if (page_ops & PAGE_SET_WRITEBACK)
-				set_page_writeback(pages[i]);
-			if (page_ops & PAGE_SET_ERROR)
-				SetPageError(pages[i]);
-			if (page_ops & PAGE_END_WRITEBACK)
-				end_page_writeback(pages[i]);
-			if (page_ops & PAGE_UNLOCK)
-				unlock_page(pages[i]);
-			if (page_ops & PAGE_LOCK) {
-				lock_page(pages[i]);
-				if (!PageDirty(pages[i]) ||
-				    pages[i]->mapping != mapping) {
-					unlock_page(pages[i]);
-					for (; i < ret; i++)
-						put_page(pages[i]);
-					err = -EAGAIN;
-					goto out;
-				}
-			}
-			put_page(pages[i]);
-			pages_locked++;
-		}
-		nr_pages -= ret;
-		index += ret;
-		cond_resched();
-	}
-out:
-	if (err && index_ret)
-		*index_ret = start_index + pages_locked - 1;
-	return err;
-}
-
 void extent_clear_unlock_delalloc(struct btrfs_inode *inode, u64 start, u64 end,
 				  struct page *locked_page,
 				  unsigned clear_bits,
@@ -2026,7 +2036,7 @@ void extent_clear_unlock_delalloc(struct btrfs_inode *inode, u64 start, u64 end,
 {
 	clear_extent_bit(&inode->io_tree, start, end, clear_bits, 1, 0, NULL);
 
-	__process_pages_contig(inode->vfs_inode.i_mapping, locked_page,
+	process_pages_contig(inode->vfs_inode.i_mapping, locked_page,
 			       start >> PAGE_SHIFT, end >> PAGE_SHIFT,
 			       page_ops, NULL);
 }
-- 
2.28.0


  parent reply	other threads:[~2020-09-30  1:56 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-30  1:54 [PATCH v3 00/49] btrfs: add partial rw support for subpage sector size Qu Wenruo
2020-09-30  1:54 ` [PATCH v3 01/49] btrfs: extent-io-tests: remove invalid tests Qu Wenruo
2020-09-30  1:54 ` [PATCH v3 02/49] btrfs: use iosize while reading compressed pages Qu Wenruo
2020-09-30  1:54 ` [PATCH v3 03/49] btrfs: extent_io: fix the comment on lock_extent_buffer_for_io() Qu Wenruo
2020-09-30  1:54 ` [PATCH v3 04/49] btrfs: extent_io: update the comment for find_first_extent_bit() Qu Wenruo
2020-09-30  1:54 ` [PATCH v3 05/49] btrfs: make btree inode io_tree has its special owner Qu Wenruo
2020-09-30  1:54 ` [PATCH v3 06/49] btrfs: disk-io: replace @fs_info and @private_data with @inode for btrfs_wq_submit_bio() Qu Wenruo
2020-09-30  1:54 ` [PATCH v3 07/49] btrfs: inode: sink parameter @start and @len for check_data_csum() Qu Wenruo
2020-09-30  1:54 ` [PATCH v3 08/49] btrfs: extent_io: unexport extent_invalidatepage() Qu Wenruo
2020-09-30  1:54 ` Qu Wenruo [this message]
2020-09-30  1:55 ` [PATCH v3 10/49] btrfs: extent_io: rename pages_locked in process_pages_contig() Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 11/49] btrfs: extent_io: make process_pages_contig() to accept bytenr directly Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 12/49] btrfs: extent_io: only require sector size alignment for page read Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 13/49] btrfs: extent_io: remove the extent_start/extent_len for end_bio_extent_readpage() Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 14/49] btrfs: extent_io: integrate page status update into endio_readpage_release_extent() Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 15/49] btrfs: extent_io: rename page_size to io_size in submit_extent_page() Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 16/49] btrfs: extent_io: add assert_spin_locked() for attach_extent_buffer_page() Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 17/49] btrfs: extent_io: extract the btree page submission code into its own helper function Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 18/49] btrfs: extent_io: calculate inline extent buffer page size based on page size Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 19/49] btrfs: extent_io: make btrfs_fs_info::buffer_radix to take sector size devided values Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 20/49] btrfs: disk_io: grab fs_info from extent_buffer::fs_info directly for btrfs_mark_buffer_dirty() Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 21/49] btrfs: disk-io: make csum_tree_block() handle sectorsize smaller than page size Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 22/49] btrfs: disk-io: extract the extent buffer verification from btree_readpage_end_io_hook() Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 23/49] btrfs: disk-io: accept bvec directly for csum_dirty_buffer() Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 24/49] btrfs: inode: make btrfs_readpage_end_io_hook() follow sector size Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 25/49] btrfs: introduce a helper to determine if the sectorsize is smaller than PAGE_SIZE Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 26/49] btrfs: extent_io: allow find_first_extent_bit() to find a range with exact bits match Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 27/49] btrfs: extent_io: don't allow tree block to cross page boundary for subpage support Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 28/49] btrfs: extent_io: update num_extent_pages() to support subpage sized extent buffer Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 29/49] btrfs: handle sectorsize < PAGE_SIZE case for extent buffer accessors Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 30/49] btrfs: disk-io: only clear EXTENT_LOCK bit for extent_invalidatepage() Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 31/49] btrfs: extent-io: make type of extent_state::state to be at least 32 bits Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 32/49] btrfs: extent_io: use extent_io_tree to handle subpage extent buffer allocation Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 33/49] btrfs: extent_io: make set/clear_extent_buffer_uptodate() to support subpage size Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 34/49] btrfs: extent_io: make the assert test on page uptodate able to handle subpage Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 35/49] btrfs: extent_io: implement subpage metadata read and its endio function Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 36/49] btrfs: extent_io: implement try_release_extent_buffer() for subpage metadata support Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 37/49] btrfs: set btree inode track_uptodate for subpage support Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 38/49] btrfs: allow RO mount of 4K sector size fs on 64K page system Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 39/49] btrfs: disk-io: allow btree_set_page_dirty() to do more sanity check on subpage metadata Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 40/49] btrfs: disk-io: support subpage metadata csum calculation at write time Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 41/49] btrfs: extent_io: prevent extent_state from being merged for btree io tree Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 42/49] btrfs: extent_io: make set_extent_buffer_dirty() to support subpage sized metadata Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 43/49] btrfs: extent_io: add subpage support for clear_extent_buffer_dirty() Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 44/49] btrfs: extent_io: make set_btree_ioerr() accept extent buffer Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 45/49] btrfs: extent_io: introduce write_one_subpage_eb() function Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 46/49] btrfs: extent_io: make lock_extent_buffer_for_io() subpage compatible Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 47/49] btrfs: extent_io: introduce submit_btree_subpage() to submit a page for subpage metadata write Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 48/49] btrfs: extent_io: introduce end_bio_subpage_eb_writepage() function Qu Wenruo
2020-09-30  1:55 ` [PATCH v3 49/49] btrfs: support metadata read write for test Qu Wenruo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200930015539.48867-10-wqu@suse.com \
    --to=wqu@suse.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.