From 299d7d7c958ed7233ec7a8b56f1c4d975a3dd2d2 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Sat, 13 Mar 2021 02:04:04 +0300 Subject: [PATCH] Use common macro for get_sqe --- src/blockstore_rollback.cpp | 7 ++----- src/blockstore_stable.cpp | 7 ++----- src/blockstore_write.cpp | 6 +----- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/blockstore_rollback.cpp b/src/blockstore_rollback.cpp index 58249719..5c2cd7ec 100644 --- a/src/blockstore_rollback.cpp +++ b/src/blockstore_rollback.cpp @@ -126,11 +126,8 @@ resume_2: resume_3: if (!disable_journal_fsync) { - io_uring_sqe *sqe = get_sqe(); - if (!sqe) - { - return 0; - } + io_uring_sqe *sqe; + BS_SUBMIT_GET_SQE_DECL(sqe); ring_data_t *data = ((ring_data_t*)sqe->user_data); my_uring_prep_fsync(sqe, journal.fd, IORING_FSYNC_DATASYNC); data->iov = { 0 }; diff --git a/src/blockstore_stable.cpp b/src/blockstore_stable.cpp index 86bc31c3..b9ae9564 100644 --- a/src/blockstore_stable.cpp +++ b/src/blockstore_stable.cpp @@ -150,11 +150,8 @@ resume_2: resume_3: if (!disable_journal_fsync) { - io_uring_sqe *sqe = get_sqe(); - if (!sqe) - { - return 0; - } + io_uring_sqe *sqe; + BS_SUBMIT_GET_SQE_DECL(sqe); ring_data_t *data = ((ring_data_t*)sqe->user_data); my_uring_prep_fsync(sqe, journal.fd, IORING_FSYNC_DATASYNC); data->iov = { 0 }; diff --git a/src/blockstore_write.cpp b/src/blockstore_write.cpp index 42f1689a..d7007b73 100644 --- a/src/blockstore_write.cpp +++ b/src/blockstore_write.cpp @@ -401,11 +401,7 @@ int blockstore_impl_t::continue_write(blockstore_op_t *op) goto resume_4; resume_2: // Only for the immediate_commit mode: prepare and submit big_write journal entry - sqe = get_sqe(); - if (!sqe) - { - return 0; - } + BS_SUBMIT_GET_SQE_DECL(sqe); je = (journal_entry_big_write*)prefill_single_journal_entry( journal, op->opcode == BS_OP_WRITE_STABLE ? JE_BIG_WRITE_INSTANT : JE_BIG_WRITE, sizeof(journal_entry_big_write)