Unverified Commit d846996a authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11407 [sync] PR-11403: btrfs: do not WARN_ON() if we have PageError set 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/11403 
 
PR sync from: Yu Kuai <yukuai3@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/NC47P4ORBDJ5QY3IG42POELVVANXAGCT/ 
 
https://gitee.com/src-openeuler/kernel/issues/IALPSO 
 
Link:https://gitee.com/openeuler/kernel/pulls/11407

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 98cf289f fd25e776

fs/btrfs/extent_io.c

+11 −10
Original line number Diff line number Diff line
@@ -5727,7 +5727,7 @@ void write_extent_buffer_chunk_tree_uuid(const struct extent_buffer *eb, 
{

	char *kaddr;



	WARN_ON(!PageUptodate(eb->pages[0]));

	WARN_ON(!PageUptodate(eb->pages[0]) && !PageError(eb->pages[0]));

	kaddr = page_address(eb->pages[0]);

	memcpy(kaddr + offsetof(struct btrfs_header, chunk_tree_uuid), srcv,

			BTRFS_FSID_SIZE);
@@ -5737,7 +5737,7 @@ void write_extent_buffer_fsid(const struct extent_buffer *eb, const void *srcv) 
{

	char *kaddr;



	WARN_ON(!PageUptodate(eb->pages[0]));

	WARN_ON(!PageUptodate(eb->pages[0]) && !PageError(eb->pages[0]));

	kaddr = page_address(eb->pages[0]);

	memcpy(kaddr + offsetof(struct btrfs_header, fsid), srcv,

			BTRFS_FSID_SIZE);
@@ -5760,7 +5760,7 @@ void write_extent_buffer(const struct extent_buffer *eb, const void *srcv, 


	while (len > 0) {

		page = eb->pages[i];

		WARN_ON(!PageUptodate(page));

		WARN_ON(!PageUptodate(page) && !PageError(page));



		cur = min(len, PAGE_SIZE - offset);

		kaddr = page_address(page);
@@ -5789,7 +5789,7 @@ void memzero_extent_buffer(const struct extent_buffer *eb, unsigned long start, 


	while (len > 0) {

		page = eb->pages[i];

		WARN_ON(!PageUptodate(page));

		WARN_ON(!PageUptodate(page) && !PageError(page));



		cur = min(len, PAGE_SIZE - offset);

		kaddr = page_address(page);
@@ -5837,7 +5837,7 @@ void copy_extent_buffer(const struct extent_buffer *dst, 


	while (len > 0) {

		page = dst->pages[i];

		WARN_ON(!PageUptodate(page));

		WARN_ON(!PageUptodate(page) && !PageError(page));



		cur = min(len, (unsigned long)(PAGE_SIZE - offset));
@@ -5899,7 +5899,8 @@ int extent_buffer_test_bit(const struct extent_buffer *eb, unsigned long start, 


	eb_bitmap_offset(eb, start, nr, &i, &offset);

	page = eb->pages[i];

	WARN_ON(!PageUptodate(page));

	WARN_ON(!PageUptodate(page) && !PageError(page));



	kaddr = page_address(page);

	return 1U & (kaddr[offset] >> (nr & (BITS_PER_BYTE - 1)));

}
@@ -5924,7 +5925,7 @@ void extent_buffer_bitmap_set(const struct extent_buffer *eb, unsigned long star 


	eb_bitmap_offset(eb, start, pos, &i, &offset);

	page = eb->pages[i];

	WARN_ON(!PageUptodate(page));

	WARN_ON(!PageUptodate(page) && !PageError(page));

	kaddr = page_address(page);



	while (len >= bits_to_set) {
@@ -5935,7 +5936,7 @@ void extent_buffer_bitmap_set(const struct extent_buffer *eb, unsigned long star 
		if (++offset >= PAGE_SIZE && len > 0) {

			offset = 0;

			page = eb->pages[++i];

			WARN_ON(!PageUptodate(page));

			WARN_ON(!PageUptodate(page) && !PageError(page));

			kaddr = page_address(page);

		}

	}
@@ -5967,7 +5968,7 @@ void extent_buffer_bitmap_clear(const struct extent_buffer *eb, 


	eb_bitmap_offset(eb, start, pos, &i, &offset);

	page = eb->pages[i];

	WARN_ON(!PageUptodate(page));

	WARN_ON(!PageUptodate(page) && !PageError(page));

	kaddr = page_address(page);



	while (len >= bits_to_clear) {
@@ -5978,7 +5979,7 @@ void extent_buffer_bitmap_clear(const struct extent_buffer *eb, 
		if (++offset >= PAGE_SIZE && len > 0) {

			offset = 0;

			page = eb->pages[++i];

			WARN_ON(!PageUptodate(page));

			WARN_ON(!PageUptodate(page) && !PageError(page));

			kaddr = page_address(page);

		}

	}