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

!14010 nilfs2: fix kernel bug due to missing clearing of buffer delay flag 

Merge Pull Request from: @ci-robot 
 
PR sync from: Kaixiong Yu <yukaixiong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WNNOYI2UGXNEENMQO32QF6SPADB7DGYD/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB2BWP 
 
Link:https://gitee.com/openeuler/kernel/pulls/14010

 

Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents fdc4bca5 ebd4fd02

fs/nilfs2/page.c

+4 −2
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ void nilfs_forget_buffer(struct buffer_head *bh) 
	const unsigned long clear_bits =

		(BIT(BH_Uptodate) | BIT(BH_Dirty) | BIT(BH_Mapped) |

		 BIT(BH_Async_Write) | BIT(BH_NILFS_Volatile) |

		 BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected));

		 BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected) |

		 BIT(BH_Delay));



	lock_buffer(bh);

	set_mask_bits(&bh->b_state, clear_bits, 0);
@@ -410,7 +411,8 @@ void nilfs_clear_dirty_page(struct page *page, bool silent) 
		const unsigned long clear_bits =

			(BIT(BH_Uptodate) | BIT(BH_Dirty) | BIT(BH_Mapped) |

			 BIT(BH_Async_Write) | BIT(BH_NILFS_Volatile) |

			 BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected));

			 BIT(BH_NILFS_Checked) | BIT(BH_NILFS_Redirected) |

			 BIT(BH_Delay));



		bh = head = page_buffers(page);

		do {