[PATCH 16/29] xfs: add nowait parameter for xfs_inode_item_init()

Hao Xu
2023-08-25T14:02:44Z

Add nowait parameter for xfs_inode_item_init() to support nowait
semantics.

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

diff --git a/fs/xfs/libxfs/xfs_trans_inode.c b/fs/xfs/libxfs/xfs_trans_inode.c
index cb4796b6e693..e7a8f63c8975 100644
--- a/fs/xfs/libxfs/xfs_trans_inode.c
+++ b/fs/xfs/libxfs/xfs_trans_inode.c
@@ -33,7 +33,8 @@ xfs_trans_ijoin(

ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
if (ip->i_itemp == NULL)
- xfs_inode_item_init(ip, ip->i_mount);
+ xfs_inode_item_init(ip, ip->i_mount,
+ tp->t_flags & XFS_TRANS_NOWAIT);
iip = ip->i_itemp;

ASSERT(iip->ili_lock_flags == 0);
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index 91c847a84e10..1742920bb4ce 100644
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -825,21 +825,25 @@ static const struct xfs_item_ops xfs_inode_item_ops = {
/*
* Initialize the inode log item for a newly allocated (in-core) inode.
*/
-void
+int
xfs_inode_item_init(
struct xfs_inode *ip,
- struct xfs_mount *mp)
+ struct xfs_mount *mp,
+ bool nowait)
{
struct xfs_inode_log_item *iip;
+ gfp_t gfp_flags = GFP_KERNEL | (nowait ? 0 : __GFP_NOFAIL);

ASSERT(ip->i_itemp == NULL);
- iip = ip->i_itemp = kmem_cache_zalloc(xfs_ili_cache,
- GFP_KERNEL | __GFP_NOFAIL);
+ iip = ip->i_itemp = kmem_cache_zalloc(xfs_ili_cache, gfp_flags);
+ if (!iip)
+ return -EAGAIN;

iip->ili_inode = ip;
spin_lock_init(&iip->ili_lock);
xfs_log_item_init(mp, &iip->ili_item, XFS_LI_INODE,
&xfs_inode_item_ops);
+ return 0;
}

/*
diff --git a/fs/xfs/xfs_inode_item.h b/fs/xfs/xfs_inode_item.h
index 377e06007804..7ba6f8a6b243 100644
--- a/fs/xfs/xfs_inode_item.h
+++ b/fs/xfs/xfs_inode_item.h
@@ -42,7 +42,8 @@ static inline int xfs_inode_clean(struct xfs_inode *ip)
return !ip->i_itemp || !(ip->i_itemp->ili_fields & XFS_ILOG_ALL);
}

-extern void xfs_inode_item_init(struct xfs_inode *, struct xfs_mount *);
+extern int xfs_inode_item_init(struct xfs_inode *ip, struct xfs_mount *mp,
+ bool nowait);
extern void xfs_inode_item_destroy(struct xfs_inode *);
extern void xfs_iflush_abort(struct xfs_inode *);
extern void xfs_iflush_shutdown_abort(struct xfs_inode *);
--
2.25.1