btrfs: use attach/detach_page_private (d1b89bc0) · Commits · 戴 / test

fs/btrfs/disk-io.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -980,9 +980,7 @@ static void btree_invalidatepage(struct page *page, unsigned int offset,
		btrfs_warn(BTRFS_I(page->mapping->host)->root->fs_info,
		"page private not zero on page %llu",
		(unsigned long long)page_offset(page));
		ClearPagePrivate(page);
		set_page_private(page, 0);
		put_page(page);
		detach_page_private(page);
		}
		}

+6 −15

Original line number	Diff line number	Diff line
		@@ -3076,22 +3076,16 @@ static int submit_extent_page(unsigned int opf,
		static void attach_extent_buffer_page(struct extent_buffer *eb,
		struct page *page)
		{
		if (!PagePrivate(page)) {
		SetPagePrivate(page);
		get_page(page);
		set_page_private(page, (unsigned long)eb);
		} else {
		if (!PagePrivate(page))
		attach_page_private(page, eb);
		else
		WARN_ON(page->private != (unsigned long)eb);
		}
		}

		void set_page_extent_mapped(struct page *page)
		{
		if (!PagePrivate(page)) {
		SetPagePrivate(page);
		get_page(page);
		set_page_private(page, EXTENT_PAGE_PRIVATE);
		}
		if (!PagePrivate(page))
		attach_page_private(page, (void *)EXTENT_PAGE_PRIVATE);
		}

		static struct extent_map *
		@@ -4910,10 +4904,7 @@ static void btrfs_release_extent_buffer_pages(struct extent_buffer *eb)
		* We need to make sure we haven't be attached
		* to a new eb.
		*/
		ClearPagePrivate(page);
		set_page_private(page, 0);
		/* One for the page private */
		put_page(page);
		detach_page_private(page);
		}

		if (mapped)

+5 −18

Original line number	Diff line number	Diff line
		@@ -8301,11 +8301,8 @@ static void btrfs_readahead(struct readahead_control *rac)
		static int __btrfs_releasepage(struct page *page, gfp_t gfp_flags)
		{
		int ret = try_release_extent_mapping(page, gfp_flags);
		if (ret == 1) {
		ClearPagePrivate(page);
		set_page_private(page, 0);
		put_page(page);
		}
		if (ret == 1)
		detach_page_private(page);
		return ret;
		}

		@@ -8327,14 +8324,8 @@ static int btrfs_migratepage(struct address_space *mapping,
		if (ret != MIGRATEPAGE_SUCCESS)
		return ret;

		if (page_has_private(page)) {
		ClearPagePrivate(page);
		get_page(newpage);
		set_page_private(newpage, page_private(page));
		set_page_private(page, 0);
		put_page(page);
		SetPagePrivate(newpage);
		}
		if (page_has_private(page))
		attach_page_private(newpage, detach_page_private(page));

		if (PagePrivate2(page)) {
		ClearPagePrivate2(page);
		@@ -8456,11 +8447,7 @@ again:
		}

		ClearPageChecked(page);
		if (PagePrivate(page)) {
		ClearPagePrivate(page);
		set_page_private(page, 0);
		put_page(page);
		}
		detach_page_private(page);
		}

		/*