[v9,12/28] xfs: Remove roll_trans boolean

Message ID	1537956907-10244-13-git-send-email-allison.henderson@oracle.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <linux-xfs-owner@kernel.org> From: Allison Henderson <allison.henderson@oracle.com> To: linux-xfs@vger.kernel.org Subject: [PATCH v9 12/28] xfs: Remove roll_trans boolean Date: Wed, 26 Sep 2018 03:14:51 -0700 Message-Id: <1537956907-10244-13-git-send-email-allison.henderson@oracle.com> In-Reply-To: <1537956907-10244-1-git-send-email-allison.henderson@oracle.com> References: <1537956907-10244-1-git-send-email-allison.henderson@oracle.com> Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk
Series	Parent Pointers v9 \| expand [v9,00/28] Parent Pointers v9 [v9,01/28] xfs: Move fs/xfs/xfs_attr.h to fs/xfs/libxfs/xfs_attr.h [v9,02/28] xfs: Add helper function xfs_attr_try_sf_addname [v9,03/28] xfs: Add attibute set and helper functions [v9,04/28] xfs: Add attibute remove and helper functions [v9,05/28] xfs: Hold inode locks in xfs_ialloc [v9,06/28] xfs: Add trans toggle to attr routines [v9,07/28] xfs: Set up infastructure for deferred attribute operations [v9,08/28] xfs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred [v9,09/28] xfs: Add xfs_has_attr and subroutines [v9,10/28] xfs: Add attr context to log item [v9,11/28] xfs: Roll delayed attr operations by returning EAGAIN [v9,12/28] xfs: Remove roll_trans boolean [v9,13/28] xfs: Remove all strlen calls in all xfs_attr_* functions for attr names. [v9,14/28] xfs: get directory offset when adding directory name [v9,15/28] xfs: get directory offset when removing directory name [v9,16/28] xfs: get directory offset when replacing a directory name [v9,17/28] xfs: add parent pointer support to attribute code [v9,18/28] xfs: define parent pointer xattr format [v9,19/28] xfs: extent transaction reservations for parent attributes [v9,20/28] xfs: parent pointer attribute creation [v9,21/28] xfs: add parent attributes to link [v9,22/28] xfs: remove parent pointers in unlink [v9,23/28] xfs: Add parent pointers to rename [v9,24/28] xfs: Add the parent pointer support to the superblock version 5. [v9,25/28] xfs: Add helper function xfs_attr_list_context_init [v9,26/28] xfs: Increase XFS_DEFER_OPS_NR_INODES to 4 [v9,27/28] xfs: Add parent pointer ioctl [v9,28/28] xfs: Add delayed attributes error tag

diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index aa99dd2..632acca 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c @@ -51,16 +51,16 @@ STATIC int xfs_attr_shortform_addname(xfs_da_args_t *args); * Internal routines when attribute list is one block. */ STATIC int xfs_attr_leaf_get(xfs_da_args_t *args); -STATIC int xfs_attr_leaf_addname(xfs_da_args_t *args, bool roll_trans); -STATIC int xfs_attr_leaf_removename(xfs_da_args_t *args, bool roll_trans); +STATIC int xfs_attr_leaf_addname(xfs_da_args_t *args); +STATIC int xfs_attr_leaf_removename(xfs_da_args_t *args); STATIC int xfs_leaf_has_attr(xfs_da_args_t *args); /* * Internal routines when attribute list is more than one block. */ STATIC int xfs_attr_node_get(xfs_da_args_t *args); -STATIC int xfs_attr_node_addname(xfs_da_args_t *args, bool roll_trans); -STATIC int xfs_attr_node_removename(xfs_da_args_t *args, bool roll_trans); +STATIC int xfs_attr_node_addname(xfs_da_args_t *args); +STATIC int xfs_attr_node_removename(xfs_da_args_t *args); STATIC int xfs_attr_node_hasname(xfs_da_args_t *args); STATIC int xfs_attr_fillstate(xfs_da_state_t *state); STATIC int xfs_attr_refillstate(xfs_da_state_t *state); @@ -238,8 +238,7 @@ int xfs_attr_set_args( struct xfs_da_args *args, struct xfs_buf **leaf_bp, - xfs_attr_state_t *state, - bool roll_trans) + xfs_attr_state_t *state) { struct xfs_inode *dp = args->dp; int error = 0; @@ -303,23 +302,6 @@ xfs_attr_set_args( */ xfs_trans_bhold(args->trans, *leaf_bp); - if (roll_trans) { - error = xfs_defer_finish(&args->trans); - if (error) - goto out; - - /* - * Commit the leaf transformation. We'll need another - * (linked) transaction to add the new attribute to the - * leaf. - */ - error = xfs_trans_roll_inode(&args->trans, dp); - if (error) - goto out; - xfs_trans_bjoin(args->trans, *leaf_bp); - *leaf_bp = NULL; - } - *state = XFS_ATTR_STATE2; return -EAGAIN; state2: @@ -328,9 +310,9 @@ xfs_attr_set_args( } if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) - error = xfs_attr_leaf_addname(args, roll_trans); + error = xfs_attr_leaf_addname(args); else - error = xfs_attr_node_addname(args, roll_trans); + error = xfs_attr_node_addname(args); if (error) goto out; @@ -366,8 +348,7 @@ xfs_has_attr( */ int xfs_attr_remove_args( - struct xfs_da_args *args, - bool roll_trans) + struct xfs_da_args *args) { struct xfs_inode *dp = args->dp; int error; @@ -378,9 +359,9 @@ xfs_attr_remove_args( ASSERT(dp->i_afp->if_flags & XFS_IFINLINE); error = xfs_attr_shortform_remove(args); } else if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) { - error = xfs_attr_leaf_removename(args, roll_trans); + error = xfs_attr_leaf_removename(args); } else { - error = xfs_attr_node_removename(args, roll_trans); + error = xfs_attr_node_removename(args); } return error; @@ -718,8 +699,7 @@ xfs_attr_shortform_addname(xfs_da_args_t *args) */ STATIC int xfs_attr_leaf_addname( - struct xfs_da_args *args, - bool roll_trans) + struct xfs_da_args *args) { struct xfs_inode *dp; struct xfs_buf *bp; @@ -785,39 +765,14 @@ xfs_attr_leaf_addname( if (error) goto out_defer_cancel; - if (roll_trans) { - error = xfs_defer_finish(&args->trans); - if (error) - return error; - - /* - * Commit the current trans (including the inode) and - * start a new one. - */ - error = xfs_trans_roll_inode(&args->trans, dp); - if (error) - return error; - } - /* * Fob the whole rest of the problem off on the Btree code. */ - error = xfs_attr_node_addname(args, roll_trans); + error = xfs_attr_node_addname(args); return error; } - - if (roll_trans) { - /* - * Commit the transaction that added the attr name so that - * later routines can manage their own transactions. - */ - error = xfs_trans_roll_inode(&args->trans, dp); - if (error) - return error; - } - /* * If there was an out-of-line value, allocate the blocks we * identified for its storage and copy the value. This is done @@ -825,7 +780,7 @@ xfs_attr_leaf_addname( * maximum size of a transaction and/or hit a deadlock. */ if (args->rmtblkno > 0) { - error = xfs_attr_rmtval_set(args, roll_trans); + error = xfs_attr_rmtval_set(args); if (error) return error; } @@ -841,7 +796,7 @@ xfs_attr_leaf_addname( * In a separate transaction, set the incomplete flag on the * "old" attr and clear the incomplete flag on the "new" attr. */ - error = xfs_attr3_leaf_flipflags(args, roll_trans); + error = xfs_attr3_leaf_flipflags(args); if (error) return error; @@ -855,7 +810,7 @@ xfs_attr_leaf_addname( args->rmtblkcnt = args->rmtblkcnt2; args->rmtvaluelen = args->rmtvaluelen2; if (args->rmtblkno) { - error = xfs_attr_rmtval_remove(args, roll_trans); + error = xfs_attr_rmtval_remove(args); if (error) return error; } @@ -879,25 +834,13 @@ xfs_attr_leaf_addname( /* bp is gone due to xfs_da_shrink_inode */ if (error) goto out_defer_cancel; - - if (roll_trans) { - error = xfs_defer_finish(&args->trans); - if (error) - return error; - } } - /* - * Commit the remove and start the next trans in series. - */ - if (roll_trans) - error = xfs_trans_roll_inode(&args->trans, dp); - } else if (args->rmtblkno > 0) { /* * Added a "remote" value, just clear the incomplete flag. */ - error = xfs_attr3_leaf_clearflag(args, roll_trans); + error = xfs_attr3_leaf_clearflag(args); } return error; out_defer_cancel: @@ -936,8 +879,7 @@ xfs_leaf_has_attr( */ STATIC int xfs_attr_leaf_removename( - struct xfs_da_args *args, - bool roll_trans) + struct xfs_da_args *args) { struct xfs_inode *dp; struct xfs_buf *bp; @@ -970,11 +912,6 @@ xfs_attr_leaf_removename( /* bp is gone due to xfs_da_shrink_inode */ if (error) goto out_defer_cancel; - if (roll_trans) { - error = xfs_defer_finish(&args->trans); - if (error) - return error; - } } return 0; out_defer_cancel: @@ -1030,8 +967,7 @@ xfs_attr_leaf_get(xfs_da_args_t *args) */ STATIC int xfs_attr_node_addname( - struct xfs_da_args *args, - bool roll_trans) + struct xfs_da_args *args) { struct xfs_da_state *state; struct xfs_da_state_blk *blk; @@ -1101,20 +1037,6 @@ xfs_attr_node_addname( if (error) goto out_defer_cancel; - if (roll_trans) { - error = xfs_defer_finish(&args->trans); - if (error) - goto out; - - /* - * Commit the node conversion and start the next - * trans in the chain. - */ - error = xfs_trans_roll_inode(&args->trans, dp); - if (error) - goto out; - } - goto restart; } @@ -1127,12 +1049,6 @@ xfs_attr_node_addname( error = xfs_da3_split(state); if (error) goto out_defer_cancel; - - if (roll_trans) { - error = xfs_defer_finish(&args->trans); - if (error) - goto out; - } } else { /* * Addition succeeded, update Btree hashvals. @@ -1148,23 +1064,13 @@ xfs_attr_node_addname( state = NULL; /* - * Commit the leaf addition or btree split and start the next - * trans in the chain. - */ - if (roll_trans) { - error = xfs_trans_roll_inode(&args->trans, dp); - if (error) - goto out; - } - - /* * If there was an out-of-line value, allocate the blocks we * identified for its storage and copy the value. This is done * after we create the attribute so that we don't overflow the * maximum size of a transaction and/or hit a deadlock. */ if (args->rmtblkno > 0) { - error = xfs_attr_rmtval_set(args, roll_trans); + error = xfs_attr_rmtval_set(args); if (error) return error; } @@ -1180,7 +1086,7 @@ xfs_attr_node_addname( * In a separate transaction, set the incomplete flag on the * "old" attr and clear the incomplete flag on the "new" attr. */ - error = xfs_attr3_leaf_flipflags(args, roll_trans); + error = xfs_attr3_leaf_flipflags(args); if (error) goto out; @@ -1194,7 +1100,7 @@ xfs_attr_node_addname( args->rmtblkcnt = args->rmtblkcnt2; args->rmtvaluelen = args->rmtvaluelen2; if (args->rmtblkno) { - error = xfs_attr_rmtval_remove(args, roll_trans); + error = xfs_attr_rmtval_remove(args); if (error) return error; } @@ -1228,11 +1134,6 @@ xfs_attr_node_addname( error = xfs_da3_join(state); if (error) goto out_defer_cancel; - if (roll_trans) { - error = xfs_defer_finish(&args->trans); - if (error) - goto out; - } } /* @@ -1246,7 +1147,7 @@ xfs_attr_node_addname( /* * Added a "remote" value, just clear the incomplete flag. */ - error = xfs_attr3_leaf_clearflag(args, roll_trans); + error = xfs_attr3_leaf_clearflag(args); if (error) goto out; } @@ -1302,8 +1203,7 @@ xfs_attr_node_hasname( */ STATIC int xfs_attr_node_removename( - struct xfs_da_args *args, - bool roll_trans) + struct xfs_da_args *args) { struct xfs_da_state *state; struct xfs_da_state_blk *blk; @@ -1353,10 +1253,10 @@ xfs_attr_node_removename( * Mark the attribute as INCOMPLETE, then bunmapi() the * remote value. */ - error = xfs_attr3_leaf_setflag(args, roll_trans); + error = xfs_attr3_leaf_setflag(args); if (error) goto out; - error = xfs_attr_rmtval_remove(args, roll_trans); + error = xfs_attr_rmtval_remove(args); if (error) goto out; @@ -1384,19 +1284,6 @@ xfs_attr_node_removename( error = xfs_da3_join(state); if (error) goto out_defer_cancel; - - if (roll_trans) { - error = xfs_defer_finish(&args->trans); - if (error) - goto out; - /* - * Commit the Btree join operation and - * start a new trans. - */ - error = xfs_trans_roll_inode(&args->trans, dp); - if (error) - goto out; - } } /* @@ -1420,11 +1307,6 @@ xfs_attr_node_removename( if (error) goto out_defer_cancel; - if (roll_trans) { - error = xfs_defer_finish(&args->trans); - if (error) - goto out; - } } else xfs_trans_brelse(args->trans, bp); } diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h index 92960ab..e2bcc4a 100644 --- a/fs/xfs/libxfs/xfs_attr.h +++ b/fs/xfs/libxfs/xfs_attr.h @@ -178,10 +178,10 @@ int xfs_attr_get(struct xfs_inode *ip, const unsigned char *name, int xfs_attr_set(struct xfs_inode *dp, const unsigned char *name, unsigned char *value, int valuelen, int flags); int xfs_attr_set_args(struct xfs_da_args *args, struct xfs_buf **leaf_bp, - xfs_attr_state_t *state, bool roll_trans); + xfs_attr_state_t *state); int xfs_attr_remove(struct xfs_inode *dp, const unsigned char *name, int flags); int xfs_has_attr(struct xfs_da_args *args); -int xfs_attr_remove_args(struct xfs_da_args *args, bool roll_trans); +int xfs_attr_remove_args(struct xfs_da_args *args); int xfs_attr_list(struct xfs_inode *dp, char *buffer, int bufsize, int flags, struct attrlist_cursor_kern *cursor); int xfs_attr_args_init(struct xfs_da_args *args, struct xfs_inode *dp, diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c index 5b979c9..f1b3c73 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.c +++ b/fs/xfs/libxfs/xfs_attr_leaf.c @@ -2672,8 +2672,7 @@ xfs_attr_leaf_newentsize( */ int xfs_attr3_leaf_clearflag( - struct xfs_da_args *args, - bool roll_trans) + struct xfs_da_args *args) { struct xfs_attr_leafblock *leaf; struct xfs_attr_leaf_entry *entry; @@ -2731,11 +2730,6 @@ xfs_attr3_leaf_clearflag( XFS_DA_LOGRANGE(leaf, name_rmt, sizeof(*name_rmt))); } - /* - * Commit the flag value change and start the next trans in series. - */ - if (roll_trans) - error = xfs_trans_roll_inode(&args->trans, args->dp); return error; } @@ -2744,8 +2738,7 @@ xfs_attr3_leaf_clearflag( */ int xfs_attr3_leaf_setflag( - struct xfs_da_args *args, - bool roll_trans) + struct xfs_da_args *args) { struct xfs_attr_leafblock *leaf; struct xfs_attr_leaf_entry *entry; @@ -2785,11 +2778,6 @@ xfs_attr3_leaf_setflag( XFS_DA_LOGRANGE(leaf, name_rmt, sizeof(*name_rmt))); } - /* - * Commit the flag value change and start the next trans in series. - */ - if (roll_trans) - error = xfs_trans_roll_inode(&args->trans, args->dp); return error; } @@ -2802,8 +2790,7 @@ xfs_attr3_leaf_setflag( */ int xfs_attr3_leaf_flipflags( - struct xfs_da_args *args, - bool roll_trans) + struct xfs_da_args *args) { struct xfs_attr_leafblock *leaf1; struct xfs_attr_leafblock *leaf2; @@ -2906,11 +2893,5 @@ xfs_attr3_leaf_flipflags( XFS_DA_LOGRANGE(leaf2, name_rmt, sizeof(*name_rmt))); } - /* - * Commit the flag value change and start the next trans in series. - */ - if (roll_trans) - error = xfs_trans_roll_inode(&args->trans, args->dp); - return error; } diff --git a/fs/xfs/libxfs/xfs_attr_leaf.h b/fs/xfs/libxfs/xfs_attr_leaf.h index 98dd169..d38c558 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.h +++ b/fs/xfs/libxfs/xfs_attr_leaf.h @@ -51,9 +51,9 @@ void xfs_attr_fork_remove(struct xfs_inode *ip, struct xfs_trans *tp); int xfs_attr3_leaf_to_node(struct xfs_da_args *args); int xfs_attr3_leaf_to_shortform(struct xfs_buf *bp, struct xfs_da_args *args, int forkoff); -int xfs_attr3_leaf_clearflag(struct xfs_da_args *args, bool roll_trans); -int xfs_attr3_leaf_setflag(struct xfs_da_args *args, bool roll_trans); -int xfs_attr3_leaf_flipflags(struct xfs_da_args *args, bool roll_trans); +int xfs_attr3_leaf_clearflag(struct xfs_da_args *args); +int xfs_attr3_leaf_setflag(struct xfs_da_args *args); +int xfs_attr3_leaf_flipflags(struct xfs_da_args *args); /* * Routines used for growing the Btree. diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c index e13000a..0e91605 100644 --- a/fs/xfs/libxfs/xfs_attr_remote.c +++ b/fs/xfs/libxfs/xfs_attr_remote.c @@ -433,8 +433,7 @@ xfs_attr_rmtval_get( */ int xfs_attr_rmtval_set( - struct xfs_da_args *args, - bool roll_trans) + struct xfs_da_args *args) { struct xfs_inode *dp = args->dp; struct xfs_mount *mp = dp->i_mount; @@ -488,26 +487,11 @@ xfs_attr_rmtval_set( if (error) goto out_defer_cancel; - if (roll_trans) { - error = xfs_defer_finish(&args->trans); - if (error) - return error; - } - ASSERT(nmap == 1); ASSERT((map.br_startblock != DELAYSTARTBLOCK) && (map.br_startblock != HOLESTARTBLOCK)); lblkno += map.br_blockcount; blkcnt -= map.br_blockcount; - - if (roll_trans) { - /* - * Start the next trans in the chain. - */ - error = xfs_trans_roll_inode(&args->trans, dp); - if (error) - return error; - } } /* @@ -570,8 +554,7 @@ xfs_attr_rmtval_set( */ int xfs_attr_rmtval_remove( - struct xfs_da_args *args, - bool roll_trans) + struct xfs_da_args *args) { struct xfs_mount *mp = args->dp->i_mount; xfs_dablk_t lblkno; @@ -633,19 +616,6 @@ xfs_attr_rmtval_remove( XFS_BMAPI_ATTRFORK, 1, &done); if (error) goto out_defer_cancel; - - if (roll_trans) { - error = xfs_defer_finish(&args->trans); - if (error) - return error; - - /* - * Close out trans and start the next one in the chain. - */ - error = xfs_trans_roll_inode(&args->trans, args->dp); - if (error) - return error; - } } return 0; out_defer_cancel: diff --git a/fs/xfs/libxfs/xfs_attr_remote.h b/fs/xfs/libxfs/xfs_attr_remote.h index c7c073d..9d20b66 100644 --- a/fs/xfs/libxfs/xfs_attr_remote.h +++ b/fs/xfs/libxfs/xfs_attr_remote.h @@ -9,7 +9,7 @@ int xfs_attr3_rmt_blocks(struct xfs_mount *mp, int attrlen); int xfs_attr_rmtval_get(struct xfs_da_args *args); -int xfs_attr_rmtval_set(struct xfs_da_args *args, bool roll_trans); -int xfs_attr_rmtval_remove(struct xfs_da_args *args, bool roll_trans); +int xfs_attr_rmtval_set(struct xfs_da_args *args); +int xfs_attr_rmtval_remove(struct xfs_da_args *args); #endif /* __XFS_ATTR_REMOTE_H__ */ diff --git a/fs/xfs/xfs_trans_attr.c b/fs/xfs/xfs_trans_attr.c index db6cb6d..4d138a9 100644 --- a/fs/xfs/xfs_trans_attr.c +++ b/fs/xfs/xfs_trans_attr.c @@ -81,11 +81,11 @@ xfs_trans_attr( case XFS_ATTR_OP_FLAGS_SET: args->op_flags |= XFS_DA_OP_ADDNAME; error = xfs_attr_set_args(args, leaf_bp, - (xfs_attr_state_t *)state, false); + (xfs_attr_state_t *)state); break; case XFS_ATTR_OP_FLAGS_REMOVE: ASSERT(XFS_IFORK_Q((args->dp))); - error = xfs_attr_remove_args(args, false); + error = xfs_attr_remove_args(args); break; default: error = -EFSCORRUPTED;

[v9,12/28] xfs: Remove roll_trans boolean

Commit Message

Patch