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

!9870 cifs: Fix deadlock in cifs_writepages during reconnect 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wang Zhaolong <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/QJ5TXKJQ7YDZD5C3HUVYTOHYQSB3VRMG/ 
 
https://gitee.com/openeuler/kernel/issues/IAASLU 
 
Link:https://gitee.com/openeuler/kernel/pulls/9870

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 8a23daf0 48fa851b

fs/cifs/file.c

+10 −4
Original line number Diff line number Diff line
@@ -2056,6 +2056,7 @@ wdata_prepare_pages(struct cifs_writedata *wdata, unsigned int found_pages, 
		 * back from swapper_space to tmpfs file mapping

		 */



relock_recheck:

		if (nr_pages == 0)

			lock_page(page);

		else if (!trylock_page(page))
@@ -2078,11 +2079,16 @@ wdata_prepare_pages(struct cifs_writedata *wdata, unsigned int found_pages, 
			break;

		}



		if (wbc->sync_mode != WB_SYNC_NONE)

		if (PageWriteback(page)) {

			unlock_page(page);

			if (wbc->sync_mode != WB_SYNC_NONE) {

				wait_on_page_writeback(page);

				goto relock_recheck;

			}

			break;

		}



		if (PageWriteback(page) ||

				!clear_page_dirty_for_io(page)) {

		if (!clear_page_dirty_for_io(page)) {

			unlock_page(page);

			break;

		}