Merge "Revert "aio: only use blk plugs for > 2 depth submissions"" (24803b2f) · Commits · e / devices / android_kernel_fairphone_FP5

fs/aio.c

+4 −14

Original line number	Diff line number	Diff line
		@@ -71,12 +71,6 @@ struct aio_ring {
		struct io_event io_events[0];
		}; /* 128 bytes + ring size */

		/*
		* Plugging is meant to work with larger batches of IOs. If we don't
		* have more than the below, then don't bother setting up a plug.
		*/
		#define AIO_PLUG_THRESHOLD 2

		#define AIO_RING_PAGES 8

		struct kioctx_table {
		@@ -1932,7 +1926,6 @@ SYSCALL_DEFINE3(io_submit, aio_context_t, ctx_id, long, nr,
		if (nr > ctx->nr_events)
		nr = ctx->nr_events;

		if (nr > AIO_PLUG_THRESHOLD)
		blk_start_plug(&plug);
		for (i = 0; i < nr; i++) {
		struct iocb __user *user_iocb;
		@@ -1946,7 +1939,6 @@ SYSCALL_DEFINE3(io_submit, aio_context_t, ctx_id, long, nr,
		if (ret)
		break;
		}
		if (nr > AIO_PLUG_THRESHOLD)
		blk_finish_plug(&plug);

		percpu_ref_put(&ctx->users);
		@@ -1974,7 +1966,6 @@ COMPAT_SYSCALL_DEFINE3(io_submit, compat_aio_context_t, ctx_id,
		if (nr > ctx->nr_events)
		nr = ctx->nr_events;

		if (nr > AIO_PLUG_THRESHOLD)
		blk_start_plug(&plug);
		for (i = 0; i < nr; i++) {
		compat_uptr_t user_iocb;
		@@ -1988,7 +1979,6 @@ COMPAT_SYSCALL_DEFINE3(io_submit, compat_aio_context_t, ctx_id,
		if (ret)
		break;
		}
		if (nr > AIO_PLUG_THRESHOLD)
		blk_finish_plug(&plug);

		percpu_ref_put(&ctx->users);