Merge "f2fs: remove blk_plugging in block_operations" (0a0bc48d) · Commits · e / devices / android_kernel_fairphone_FP4

fs/f2fs/checkpoint.c

+3 −8

Original line number	Diff line number	Diff line
		@@ -1166,11 +1166,8 @@ static int block_operations(struct f2fs_sb_info *sbi)
		.nr_to_write = LONG_MAX,
		.for_reclaim = 0,
		};
		struct blk_plug plug;
		int err = 0, cnt = 0;

		blk_start_plug(&plug);

		/*
		* Let's flush inline_data in dirty node pages.
		*/
		@@ -1203,7 +1200,7 @@ static int block_operations(struct f2fs_sb_info *sbi)
		f2fs_unlock_all(sbi);
		err = f2fs_sync_dirty_inodes(sbi, DIR_INODE);
		if (err)
		goto out;
		return err;
		cond_resched();
		goto retry_flush_quotas;
		}
		@@ -1219,7 +1216,7 @@ static int block_operations(struct f2fs_sb_info *sbi)
		f2fs_unlock_all(sbi);
		err = f2fs_sync_inode_meta(sbi);
		if (err)
		goto out;
		return err;
		cond_resched();
		goto retry_flush_quotas;
		}
		@@ -1235,7 +1232,7 @@ static int block_operations(struct f2fs_sb_info *sbi)
		if (err) {
		up_write(&sbi->node_change);
		f2fs_unlock_all(sbi);
		goto out;
		return err;
		}
		cond_resched();
		goto retry_flush_nodes;
		@@ -1247,8 +1244,6 @@ static int block_operations(struct f2fs_sb_info *sbi)
		*/
		__prepare_cp_block(sbi);
		up_write(&sbi->node_change);
		out:
		blk_finish_plug(&plug);
		return err;
		}