Merge "f2fs: Avoid double lock for cp_rwsem during checkpoint" (931cc239) · Commits · e / devices / android_kernel_fairphone_FP4

fs/f2fs/checkpoint.c

+4 −6

Original line number	Diff line number	Diff line
		@@ -1216,21 +1216,19 @@ static int block_operations(struct f2fs_sb_info *sbi)
		goto retry_flush_quotas;
		}

		retry_flush_nodes:
		down_write(&sbi->node_write);

		if (get_pages(sbi, F2FS_DIRTY_NODES)) {
		up_write(&sbi->node_write);
		up_write(&sbi->node_change);
		f2fs_unlock_all(sbi);
		atomic_inc(&sbi->wb_sync_req[NODE]);
		err = f2fs_sync_node_pages(sbi, &wbc, false, FS_CP_NODE_IO);
		atomic_dec(&sbi->wb_sync_req[NODE]);
		if (err) {
		up_write(&sbi->node_change);
		f2fs_unlock_all(sbi);
		if (err)
		goto out;
		}
		cond_resched();
		goto retry_flush_nodes;
		goto retry_flush_quotas;
		}

		/*