[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230825135431.1317785-27-hao.xu@linux.dev>
Date: Fri, 25 Aug 2023 21:54:28 +0800
From: Hao Xu <hao.xu@...ux.dev>
To: io-uring@...r.kernel.org, Jens Axboe <axboe@...nel.dk>
Cc: Dominique Martinet <asmadeus@...ewreck.org>,
Pavel Begunkov <asml.silence@...il.com>,
Christian Brauner <brauner@...nel.org>,
Alexander Viro <viro@...iv.linux.org.uk>,
Stefan Roesch <shr@...com>, Clay Harris <bugs@...ycon.org>,
Dave Chinner <david@...morbit.com>,
"Darrick J . Wong" <djwong@...nel.org>,
linux-fsdevel@...r.kernel.org, linux-xfs@...r.kernel.org,
linux-ext4@...r.kernel.org, linux-cachefs@...hat.com,
ecryptfs@...r.kernel.org, linux-nfs@...r.kernel.org,
linux-unionfs@...r.kernel.org, bpf@...r.kernel.org,
netdev@...r.kernel.org, linux-s390@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-block@...r.kernel.org,
linux-btrfs@...r.kernel.org, codalist@...a.cs.cmu.edu,
linux-f2fs-devel@...ts.sourceforge.net, cluster-devel@...hat.com,
linux-mm@...ck.org, linux-nilfs@...r.kernel.org,
devel@...ts.orangefs.org, linux-cifs@...r.kernel.org,
samba-technical@...ts.samba.org, linux-mtd@...ts.infradead.org,
Wanpeng Li <wanpengli@...cent.com>
Subject: [PATCH 26/29] xfs: return -EAGAIN when nowait meets sync in transaction commit
From: Hao Xu <howeyxu@...cent.com>
if the log transaction is a sync one, let's fail the nowait try and
return -EAGAIN directly since sync transaction means blocked by IO.
Signed-off-by: Hao Xu <howeyxu@...cent.com>
---
fs/xfs/xfs_trans.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c
index 7988b4c7f36e..f1f84a3dd456 100644
--- a/fs/xfs/xfs_trans.c
+++ b/fs/xfs/xfs_trans.c
@@ -968,12 +968,24 @@ __xfs_trans_commit(
xfs_csn_t commit_seq = 0;
int error = 0;
int sync = tp->t_flags & XFS_TRANS_SYNC;
+ bool nowait = tp->t_flags & XFS_TRANS_NOWAIT;
+ bool perm_log = tp->t_flags & XFS_TRANS_PERM_LOG_RES;
trace_xfs_trans_commit(tp, _RET_IP_);
+ if (nowait && sync) {
+ /*
+ * Currently nowait is only from xfs_vn_update_time()
+ * so perm_log is always false here, but let's make
+ * code general.
+ */
+ if (perm_log)
+ xfs_defer_cancel(tp);
+ goto out_unreserve;
+ }
error = xfs_trans_run_precommits(tp);
if (error) {
- if (tp->t_flags & XFS_TRANS_PERM_LOG_RES)
+ if (perm_log)
xfs_defer_cancel(tp);
goto out_unreserve;
}
--
2.25.1
Powered by blists - more mailing lists