hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IBEN7H CVE: NA -------------------------------- Factor out wrapper xfs_attr3_leaf_init function, which exported for external use. Fixes: 94349af34627 ("xfs: atomic drop extent entries when inactiving attr") Signed-off-by: Long Li <leo.lilong@huawei.com> --- fs/xfs/libxfs/xfs_attr_leaf.c | 56 +++++++++++++++++++++++++---------- fs/xfs/libxfs/xfs_attr_leaf.h | 3 ++ 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c index 51ff44068675..b014cd9b1203 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.c +++ b/fs/xfs/libxfs/xfs_attr_leaf.c @@ -1286,36 +1286,30 @@ xfs_attr3_leaf_to_node( * Routines used for growing the Btree. *========================================================================*/ -/* - * Create the initial contents of a leaf attribute list - * or a leaf in a node attribute list. - */ STATIC int -xfs_attr3_leaf_create( - struct xfs_da_args *args, +__xfs_attr3_leaf_create( + struct xfs_trans *tp, + struct xfs_inode *dp, + struct xfs_da_geometry *geo, xfs_dablk_t blkno, struct xfs_buf **bpp) { struct xfs_attr_leafblock *leaf; struct xfs_attr3_icleaf_hdr ichdr; - struct xfs_inode *dp = args->dp; struct xfs_mount *mp = dp->i_mount; struct xfs_buf *bp; int error; - trace_xfs_attr_leaf_create(args); - - error = xfs_da_get_buf(args->trans, args->dp, blkno, &bp, - XFS_ATTR_FORK); + error = xfs_da_get_buf(tp, dp, blkno, &bp, XFS_ATTR_FORK); if (error) return error; bp->b_ops = &xfs_attr3_leaf_buf_ops; - xfs_trans_buf_set_type(args->trans, bp, XFS_BLFT_ATTR_LEAF_BUF); + xfs_trans_buf_set_type(tp, bp, XFS_BLFT_ATTR_LEAF_BUF); leaf = bp->b_addr; - memset(leaf, 0, args->geo->blksize); + memset(leaf, 0, geo->blksize); memset(&ichdr, 0, sizeof(ichdr)); - ichdr.firstused = args->geo->blksize; + ichdr.firstused = geo->blksize; if (xfs_has_crc(mp)) { struct xfs_da3_blkinfo *hdr3 = bp->b_addr; @@ -1333,13 +1327,43 @@ xfs_attr3_leaf_create( } ichdr.freemap[0].size = ichdr.firstused - ichdr.freemap[0].base; - xfs_attr3_leaf_hdr_to_disk(args->geo, leaf, &ichdr); - xfs_trans_log_buf(args->trans, bp, 0, args->geo->blksize - 1); + xfs_attr3_leaf_hdr_to_disk(geo, leaf, &ichdr); + xfs_trans_log_buf(tp, bp, 0, geo->blksize - 1); *bpp = bp; return 0; } +/* + * Create the initial contents of a leaf attribute list + * or a leaf in a node attribute list. + */ +STATIC int +xfs_attr3_leaf_create( + struct xfs_da_args *args, + xfs_dablk_t blkno, + struct xfs_buf **bpp) +{ + trace_xfs_attr_leaf_create(args); + return __xfs_attr3_leaf_create(args->trans, args->dp, + args->geo, blkno, bpp); +} + +/* + * Wrapper function of initializing leaf node, export for external use. + */ +int +xfs_attr3_leaf_init( + struct xfs_trans *tp, + struct xfs_inode *dp, + xfs_dablk_t blkno) +{ + struct xfs_buf *bp = NULL; + struct xfs_da_geometry *geo = dp->i_mount->m_attr_geo; + + return __xfs_attr3_leaf_create(tp, dp, geo, blkno, &bp); +} + /* * Split the leaf node, rebalance, then add the new entry. */ diff --git a/fs/xfs/libxfs/xfs_attr_leaf.h b/fs/xfs/libxfs/xfs_attr_leaf.h index 368f4d9fa1d5..9fc716e04e2e 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.h +++ b/fs/xfs/libxfs/xfs_attr_leaf.h @@ -72,6 +72,9 @@ int xfs_attr3_leaf_flipflags(struct xfs_da_args *args); /* * Routines used for growing the Btree. */ + +int xfs_attr3_leaf_init(struct xfs_trans *tp, struct xfs_inode *dp, + xfs_dablk_t blkno); int xfs_attr3_leaf_split(struct xfs_da_state *state, struct xfs_da_state_blk *oldblk, struct xfs_da_state_blk *newblk); -- 2.39.2