From: Jens Axboe <axboe@kernel.dk>
Date: Wed, 16 Jan 2019 16:07:13 +0000 (-0700)
Subject: engines/io_uring: cleanup setrlimit()
X-Git-Tag: fio-3.13~12
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=2d644205f56953192d27ccbf193c899ae559fcb7

engines/io_uring: cleanup setrlimit()

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/engines/io_uring.c b/engines/io_uring.c
index 5fda2fc9..c759ec19 100644
--- a/engines/io_uring.c
+++ b/engines/io_uring.c
@@ -462,15 +462,6 @@ static int fio_ioring_queue_init(struct thread_data *td)
 		}
 	}
 
-	if (o->fixedbufs) {
-		struct rlimit rlim = {
-			.rlim_cur = RLIM_INFINITY,
-			.rlim_max = RLIM_INFINITY,
-		};
-
-		setrlimit(RLIMIT_MEMLOCK, &rlim);
-	}
-
 	ret = syscall(__NR_sys_io_uring_setup, depth, &p);
 	if (ret < 0)
 		return ret;
@@ -478,6 +469,14 @@ static int fio_ioring_queue_init(struct thread_data *td)
 	ld->ring_fd = ret;
 
 	if (o->fixedbufs) {
+		struct rlimit rlim = {
+			.rlim_cur = RLIM_INFINITY,
+			.rlim_max = RLIM_INFINITY,
+		};
+
+		if (setrlimit(RLIMIT_MEMLOCK, &rlim) < 0)
+			return -1;
+
 		ret = syscall(__NR_sys_io_uring_register, ld->ring_fd,
 				IORING_REGISTER_BUFFERS, ld->iovecs, depth);
 		if (ret < 0)