[PATCH 17/29] xfs: make xfs_trans_ijoin() error out -EAGAIN

Hao Xu
2023-08-25T14:03:01Z

Change return value of xfs_trans_ijoin() to error out -EAGAIN.

Signed-off-by: Hao Xu <howeyxu@tencent.com>
---
fs/xfs/libxfs/xfs_trans_inode.c | 13 +++++++++----
fs/xfs/xfs_iops.c | 4 +++-
fs/xfs/xfs_trans.h | 2 +-
3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_trans_inode.c b/fs/xfs/libxfs/xfs_trans_inode.c
index e7a8f63c8975..7bda62bad90a 100644
--- a/fs/xfs/libxfs/xfs_trans_inode.c
+++ b/fs/xfs/libxfs/xfs_trans_inode.c
@@ -23,7 +23,7 @@
* The inode must be locked, and it cannot be associated with any transaction.
* If lock_flags is non-zero the inode will be unlocked on transaction commit.
*/
-void
+int
xfs_trans_ijoin(
struct xfs_trans *tp,
struct xfs_inode *ip,
@@ -32,9 +32,12 @@ xfs_trans_ijoin(
struct xfs_inode_log_item *iip;

ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
- if (ip->i_itemp == NULL)
- xfs_inode_item_init(ip, ip->i_mount,
- tp->t_flags & XFS_TRANS_NOWAIT);
+ if (ip->i_itemp == NULL) {
+ int ret = xfs_inode_item_init(ip, ip->i_mount,
+ tp->t_flags & XFS_TRANS_NOWAIT);
+ if (ret == -EAGAIN)
+ return ret;
+ }
iip = ip->i_itemp;

ASSERT(iip->ili_lock_flags == 0);
@@ -44,6 +47,8 @@ xfs_trans_ijoin(
/* Reset the per-tx dirty context and add the item to the tx. */
iip->ili_dirty_flags = 0;
xfs_trans_add_item(tp, &iip->ili_item);
+
+ return 0;
}

/*
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index 47b4fd5f8f5c..034a8fea1f8e 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -1075,7 +1075,9 @@ xfs_vn_update_time(
if (flags & S_ATIME)
inode->i_atime = *now;

- xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
+ error = xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
+ if (error)
+ goto out;
xfs_trans_log_inode(tp, ip, log_flags);
error = xfs_trans_commit(tp);

diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
index 6e3646d524ce..f2c05884c4b6 100644
--- a/fs/xfs/xfs_trans.h
+++ b/fs/xfs/xfs_trans.h
@@ -226,7 +226,7 @@ bool xfs_trans_ordered_buf(xfs_trans_t *, struct xfs_buf *);
void xfs_trans_dquot_buf(xfs_trans_t *, struct xfs_buf *, uint);
void xfs_trans_inode_alloc_buf(xfs_trans_t *, struct xfs_buf *);
void xfs_trans_ichgtime(struct xfs_trans *, struct xfs_inode *, int);
-void xfs_trans_ijoin(struct xfs_trans *, struct xfs_inode *, uint);
+int xfs_trans_ijoin(struct xfs_trans *, struct xfs_inode *, uint);
void xfs_trans_log_buf(struct xfs_trans *, struct xfs_buf *, uint,
uint);
void xfs_trans_dirty_buf(struct xfs_trans *, struct xfs_buf *);
--
2.25.1