xfsprogs: Delayed Attributes
v13 cover xfsprogs: Delayed Attributes
Hi all,
This set applies the corresponding changes for delayed attributes to xfsprogs. I will pick up the reviews from the kernel side series and mirror them here. This set also includes some patches from the kernel side that have not yet been ported. This set also includes patches needed for the user space cli and log printing routines
This series can also be viewed on github here:
https://github.com/allisonhenderson/xfs_work/tree/delay_ready_attrs_xfsprogs_v13
And also the extended delayed attribute and parent pointer series:
https://github.com/allisonhenderson/xfs_work/tree/delay_ready_attrs_xfsprogs_v13_extended
Thanks all!
Allison
Allison Collins (7):
xfsprogs: Add helper xfs_attr_node_remove_step
xfsprogs: Rename __xfs_attr_rmtval_remove
xfsprogs: Set up infastructure for deferred attribute operations
xfsprogs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred
xfsprogs: Enable delayed attributes
xfs_io: Add delayed attributes error tag
xfsprogs: Add delayed attribute flag to cmd
Allison Henderson (5):
xfsprogs: Add delay ready attr remove routines
xfsprogs: Add delay ready attr set routines
xfsprogs: Add feature bit XFS_SB_FEAT_INCOMPAT_LOG_DELATTR
xfsprogs: Remove unused xfs_attr_*_args
[RFC] xfsprogs: Add log item printing for ATTRI and ATTRD
Darrick J. Wong (2):
xfs: store inode btree block counts in AGI header
xfs: enable new inode btree counters feature
include/libxfs.h | 1 + io/inject.c | 1 + libxfs/defer_item.c | 132 +++++++++++ libxfs/libxfs_priv.h | 1 + libxfs/xfs_ag.c | 5 + libxfs/xfs_attr.c | 547 +++++++++++++++++++++++++++++++--------------- libxfs/xfs_attr.h | 219 ++++++++++++++++++- libxfs/xfs_attr_leaf.c | 2 +- libxfs/xfs_attr_remote.c | 114 ++++++---- libxfs/xfs_attr_remote.h | 7 +- libxfs/xfs_defer.c | 1 + libxfs/xfs_defer.h | 2 + libxfs/xfs_errortag.h | 4 +- libxfs/xfs_format.h | 32 ++- libxfs/xfs_fs.h | 1 + libxfs/xfs_ialloc.c | 1 + libxfs/xfs_ialloc_btree.c | 21 ++ libxfs/xfs_log_format.h | 43 +++- libxfs/xfs_sb.c | 2 + libxfs/xfs_types.h | 1 + logprint/log_misc.c | 31 ++- logprint/log_print_all.c | 12 + logprint/log_redo.c | 197 +++++++++++++++++ logprint/logprint.h | 10 + mkfs/xfs_mkfs.c | 24 +- 25 files changed, 1179 insertions(+), 232 deletions(-)
Signature · 1 line
2.7.4
PATCH v13 1/14 xfs: store inode btree block counts in AGI header
From: "Darrick J. Wong" <[email protected]>
Source kernel commit: 2a39946c984464e4aac82c556ba9915589be7323
Add a btree block usage counters for both inode btrees to the AGI header so that we don't have to walk the entire finobt at mount time to create the per-AG reservations.
--- libxfs/xfs_ag.c | 5 +++++ libxfs/xfs_format.h | 18 +++++++++++++++++- libxfs/xfs_ialloc.c | 1 + libxfs/xfs_ialloc_btree.c | 21 +++++++++++++++++++++ 4 files changed, 44 insertions(+), 1 deletion(-)
libxfs/xfs_ag.c +5 -0
@@ -333,6 +333,11 @@ xfs_agiblock_init( }for (bucket =0 ; bucket <XFS_AGI_UNLINKED_BUCKETS ; bucket++) agi->agi_unlinked[bucket] =cpu_to_be32 (NULLAGINO ); +if (xfs_sb_version_hasinobtcounts (&mp->m_sb)) { + agi->agi_iblocks =cpu_to_be32 (1 ); +if (xfs_sb_version_hasfinobt (&mp->m_sb)) + agi->agi_fblocks =cpu_to_be32 (1 ); + } } typedef void (*aghdr_init_work_f)(struct xfs_mount *mp, struct xfs_buf *bp,
libxfs/xfs_format.h +17 -1
@@ -449,6 +449,7 @@ xfs_sb_has_compat_feature(#define XFS_SB_FEAT_RO_COMPAT_FINOBT (1 << 0)/* free inode btree */ #define XFS_SB_FEAT_RO_COMPAT_RMAPBT (1 << 1)/* reverse map btree */ #define XFS_SB_FEAT_RO_COMPAT_REFLINK (1 << 2)/* reflinked files */ +#define XFS_SB_FEAT_RO_COMPAT_INOBTCNT (1 << 3)/* inobt block counts */ #define XFS_SB_FEAT_RO_COMPAT_ALL \ (XFS_SB_FEAT_RO_COMPAT_FINOBT | \ XFS_SB_FEAT_RO_COMPAT_RMAPBT | \
@@ -564,6 +565,17 @@ static inline bool xfs_sb_version_hasreflink(struct xfs_sb *sbp) }/* +* Inode btree block counter. We record the number of inobt and finobt blocks +* in the AGI header so that we can skip the finobt walk at mount time when +* setting up per-AG reservations. +*/ +static inline bool xfs_sb_version_hasinobtcounts (struct xfs_sb *sbp) +{ +return XFS_SB_VERSION_NUM (sbp) ==XFS_SB_VERSION_5 && + (sbp->sb_features_ro_compat &XFS_SB_FEAT_RO_COMPAT_INOBTCNT ); +} + +/* * end of superblock version macros */
@@ -765,6 +777,9 @@ typedef struct xfs_agi {__be32 agi_free_root;/* root of the free inode btree */ __be32 agi_free_level;/* levels in free inode btree */ +__be32 agi_iblocks;/* inobt blocks used */ +__be32 agi_fblocks;/* finobt blocks used */ +/* structure must be padded to 64 bit alignment */ } xfs_agi_t;
@@ -785,7 +800,8 @@ typedef struct xfs_agi {#define XFS_AGI_ALL_BITS_R1 ((1 << XFS_AGI_NUM_BITS_R1) - 1)#define XFS_AGI_FREE_ROOT (1 << 11)#define XFS_AGI_FREE_LEVEL (1 << 12) -#define XFS_AGI_NUM_BITS_R2 13 +#define XFS_AGI_IBLOCKS (1 << 13)/* both inobt/finobt block counters */ +#define XFS_AGI_NUM_BITS_R2 14/* disk block (xfs_daddr_t) in the AG */ #define XFS_AGI_DADDR (mp) ((xfs_daddr_t)(2 << (mp)->m_sectbb_log))
libxfs/xfs_ialloc.c +1 -0
@@ -2468,6 +2468,7 @@ xfs_ialloc_log_agi( offsetof(xfs_agi_t , agi_unlinked), offsetof(xfs_agi_t , agi_free_root), offsetof(xfs_agi_t , agi_free_level), + offsetof(xfs_agi_t , agi_iblocks), sizeof(xfs_agi_t) };#ifdef DEBUG
libxfs/xfs_ialloc_btree.c +21 -0
@@ -66,6 +66,25 @@ xfs_finobt_set_root( XFS_AGI_FREE_ROOT | XFS_AGI_FREE_LEVEL); } +/* Update the inode btree block counter for this btree. */ +static inline void +xfs_inobt_mod_blockcount ( +struct xfs_btree_cur *cur, +int howmuch) +{ +struct xfs_buf *agbp = cur->bc_ag.agbp; +struct xfs_agi *agi = agbp->b_addr; + +if (!xfs_sb_version_hasinobtcounts (&cur->bc_mp->m_sb)) +return ; + +if (cur->bc_btnum ==XFS_BTNUM_FINO ) +be32_add_cpu (&agi->agi_fblocks, howmuch); +else if (cur->bc_btnum ==XFS_BTNUM_INO ) +be32_add_cpu (&agi->agi_iblocks, howmuch); +xfs_ialloc_log_agi (cur->bc_tp, agbp,XFS_AGI_IBLOCKS ); +} + STATIC int __xfs_inobt_alloc_block( struct xfs_btree_cur *cur,
@@ -101,6 +120,7 @@ __xfs_inobt_alloc_block( new->s =cpu_to_be32 (XFS_FSB_TO_AGBNO (args.mp, args.fsbno)); *stat =1 ; +xfs_inobt_mod_blockcount (cur,1 );return 0 ; }
@@ -133,6 +153,7 @@ __xfs_inobt_free_block(struct xfs_buf *bp, enum xfs_ag_resv_type resv) { + xfs_inobt_mod_blockcount(cur, -1);return xfs_free_extent (cur->bc_tp,XFS_DADDR_TO_FSB (cur->bc_mp,XFS_BUF_ADDR (bp)),1 , &XFS_RMAP_OINFO_INOBT , resv);
Signature · 1 line
2.7.4
PATCH v13 2/14 xfs: enable new inode btree counters feature
In reply to Allison HendersonFrom: "Darrick J. Wong" <[email protected]>
Source kernel commit: b896a39faa5a2f97dadfb347928466afb12cc63a
Enable the new inode btree counters feature.
--- libxfs/xfs_format.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
libxfs/xfs_format.h +2 -1
@@ -453,7 +453,8 @@ xfs_sb_has_compat_feature(#define XFS_SB_FEAT_RO_COMPAT_ALL \ (XFS_SB_FEAT_RO_COMPAT_FINOBT | \ XFS_SB_FEAT_RO_COMPAT_RMAPBT | \ - XFS_SB_FEAT_RO_COMPAT_REFLINK) + XFS_SB_FEAT_RO_COMPAT_REFLINK| \ + XFS_SB_FEAT_RO_COMPAT_INOBTCNT)#define XFS_SB_FEAT_RO_COMPAT_UNKNOWN ~XFS_SB_FEAT_RO_COMPAT_ALLstatic inline bool xfs_sb_has_ro_compat_feature(
Signature · 1 line
2.7.4
PATCH v13 3/14 xfsprogs: Add helper xfs_attr_node_remove_step
In reply to Allison HendersonFrom: Allison Collins <[email protected]>
Source kernel commit: 5e2aff99f8f0b7ff511b7bbd1213743f59806878
This patch adds a new helper function xfs_attr_node_remove_step. This will help simplify and modularize the calling function xfs_attr_node_remove.
--- libxfs/xfs_attr.c | 46 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 12 deletions(-)
libxfs/xfs_attr.c +34 -12
@@ -1220,19 +1220,14 @@ xfs_attr_node_remove_rmt(* the root node (a special case of an intermediate node). */ STATIC int -xfs_attr_node_removename ( -struct xfs_da_args *args) +xfs_attr_node_remove_step ( +struct xfs_da_args *args, +struct xfs_da_state *state) { -struct xfs_da_state *state;struct xfs_da_state_blk *blk;int retval, error;struct xfs_inode *dp = args->dp; -trace_xfs_attr_node_removename (args); - - error =xfs_attr_node_removename_setup (args, &state); -if (error) - goto out;/* * If there is an out-of-line value, de-allocate the blocks.
@@ -1242,7 +1237,7 @@ xfs_attr_node_removename(if (args->rmtblkno >0 ) { error =xfs_attr_node_remove_rmt (args, state);if (error) - goto out; +return error; }/*
@@ -1259,18 +1254,45 @@ xfs_attr_node_removename(if (retval && (state->path.active >1 )) { error =xfs_da3_join (state);if (error) - goto out; +return error; error =xfs_defer_finish (&args->trans);if (error) - goto out; +return error;/* * Commit the Btree join operation and start a new trans. */ error =xfs_trans_roll_inode (&args->trans, dp);if (error) - goto out; +return error; } +return error; +} + +/* +* Remove a name from a B-tree attribute list. +* +* This routine will find the blocks of the name to remove, remove them and +* shirnk the tree if needed. +*/ +STATIC int +xfs_attr_node_removename ( +struct xfs_da_args *args) +{ +struct xfs_da_state *state; +int error; +struct xfs_inode *dp = args->dp; + +trace_xfs_attr_node_removename (args); + + error =xfs_attr_node_removename_setup (args, &state); +if (error) + goto out; + + error =xfs_attr_node_remove_step (args, state); +if (error) + goto out; +/* * If the result is small enough, push it all into the inode. */
Signature · 1 line
2.7.4
PATCH v13 4/14 xfsprogs: Add delay ready attr remove routines
In reply to Allison HendersonThis patch modifies the attr remove routines to be delay ready. This means they no longer roll or commit transactions, but instead return -EAGAIN to have the calling routine roll and refresh the transaction. In this series, xfs_attr_remove_args has become xfs_attr_remove_iter, which uses a sort of state machine like switch to keep track of where it was when EAGAIN was returned. xfs_attr_node_removename has also been modified to use the switch, and a new version of xfs_attr_remove_args consists of a simple loop to refresh the transaction until the operation is completed. A new XFS_DAC_DEFER_FINISH flag is used to finish the transaction where ever the existing code used to.
Calls to xfs_attr_rmtval_remove are replaced with the delay ready version __xfs_attr_rmtval_remove. We will rename __xfs_attr_rmtval_remove back to xfs_attr_rmtval_remove when we are done.
xfs_attr_rmtval_remove itself is still in use by the set routines (used during a rename). For reasons of preserving existing function, we modify xfs_attr_rmtval_remove to call xfs_defer_finish when the flag is set. Similar to how xfs_attr_remove_args does here. Once we transition the set routines to be delay ready, xfs_attr_rmtval_remove is no longer used and will be removed.
This patch also adds a new struct xfs_delattr_context, which we will use to keep track of the current state of an attribute operation. The new xfs_delattr_state enum is used to track various operations that are in progress so that we know not to repeat them, and resume where we left off before EAGAIN was returned to cycle out the transaction. Other members take the place of local variables that need to retain their values across multiple function recalls. See xfs_attr.h for a more detailed diagram of the states.
--- include/libxfs.h | 1 + libxfs/xfs_attr.c | 200 ++++++++++++++++++++++++++++++++++------------- libxfs/xfs_attr.h | 72 +++++++++++++++++ libxfs/xfs_attr_leaf.c | 2 +- libxfs/xfs_attr_remote.c | 36 ++++----- libxfs/xfs_attr_remote.h | 2 +- 6 files changed, 239 insertions(+), 74 deletions(-)
include/libxfs.h +1 -0
@@ -170,6 +170,7 @@ enum ce { CE_DEBUG, CE_CONT, CE_NOTE, CE_WARN, CE_ALERT, CE_PANIC };#include "xfs_ialloc.h" #include "xfs_attr_leaf.h" +#include "xfs_attr.h" #include "xfs_attr_remote.h" #include "xfs_trans_space.h"
libxfs/xfs_attr.c +147 -53
292 lines not on this page · raw message
libxfs/xfs_attr.h +72 -0
84 lines not on this page · raw message
libxfs/xfs_attr_leaf.c +1 -1
@@ -19,8 +19,8 @@#include "xfs_bmap_btree.h" #include "xfs_bmap.h" #include "xfs_attr_sf.h" -#include "xfs_attr_remote.h" #include "xfs_attr.h" +#include "xfs_attr_remote.h" #include "xfs_attr_leaf.h" #include "xfs_trace.h" #include "xfs_dir2.h"
libxfs/xfs_attr_remote.c +17 -19
@@ -675,10 +675,12 @@ xfs_attr_rmtval_invalidate(*/ int xfs_attr_rmtval_remove ( -struct xfs_da_args *args) +struct xfs_da_args *args) { -int error; -int retval; +int error; +struct xfs_delattr_context dac = { + .da_args = args, + };trace_xfs_attr_rmtval_remove (args);
@@ -686,19 +688,16 @@ xfs_attr_rmtval_remove(* Keep de-allocating extents until the remote-value region is gone. */ do { - retval =__xfs_attr_rmtval_remove (args); -if (retval && retval != -EAGAIN ) -return retval; + error =__xfs_attr_rmtval_remove (&dac); +if (error != -EAGAIN ) +break ; -/* -* Close out trans and start the next one in the chain. -*/ - error =xfs_trans_roll_inode (&args->trans, args->dp); + error =xfs_attr_trans_roll (&dac);if (error)return error; - }while (retval == -EAGAIN ); + }while (true); -return 0 ; +return error; }/*
@@ -708,9 +707,10 @@ xfs_attr_rmtval_remove(*/ int __xfs_attr_rmtval_remove ( -struct xfs_da_args *args) +struct xfs_delattr_context *dac) { -int error, done; +struct xfs_da_args *args = dac->da_args; +int error, done;/* * Unmap value blocks for this attr.
@@ -720,12 +720,10 @@ __xfs_attr_rmtval_remove(if (error)return error; - error =xfs_defer_finish (&args->trans); -if (error) -return error; - -if (!done) +if (!done) { + dac->flags |=XFS_DAC_DEFER_FINISH ;return -EAGAIN ; + }return error; }
libxfs/xfs_attr_remote.h +1 -1
@@ -14,5 +14,5 @@ int xfs_attr_rmtval_remove(struct xfs_da_args *args);int xfs_attr_rmtval_stale (struct xfs_inode *ip,struct xfs_bmbt_irec *map,xfs_buf_flags_t incore_flags);int xfs_attr_rmtval_invalidate (struct xfs_da_args *args); -int __xfs_attr_rmtval_remove (struct xfs_da_args *args); +int __xfs_attr_rmtval_remove (struct xfs_delattr_context *dac);#endif /* __XFS_ATTR_REMOTE_H__ */
Signature · 1 line
2.7.4
PATCH v13 5/14 xfsprogs: Add delay ready attr set routines
In reply to Allison HendersonThis patch modifies the attr set routines to be delay ready. This means they no longer roll or commit transactions, but instead return -EAGAIN to have the calling routine roll and refresh the transaction. In this series, xfs_attr_set_args has become xfs_attr_set_iter, which uses a state machine like switch to keep track of where it was when EAGAIN was returned. See xfs_attr.h for a more detailed diagram of the states.
Two new helper functions have been added: xfs_attr_rmtval_set_init and xfs_attr_rmtval_set_blk. They provide a subset of logic similar to xfs_attr_rmtval_set, but they store the current block in the delay attr context to allow the caller to roll the transaction between allocations. This helps to simplify and consolidate code used by xfs_attr_leaf_addname and xfs_attr_node_addname. xfs_attr_set_args has now become a simple loop to refresh the transaction until the operation is completed. Lastly, xfs_attr_rmtval_remove is no longer used, and is removed.
--- libxfs/xfs_attr.c | 370 +++++++++++++++++++++++++++++++---------------- libxfs/xfs_attr.h | 126 +++++++++++++++- libxfs/xfs_attr_remote.c | 98 ++++++++----- libxfs/xfs_attr_remote.h | 4 + 4 files changed, 439 insertions(+), 159 deletions(-)
libxfs/xfs_attr.c +245 -125
@@ -44,7 +44,7 @@ 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); +STATIC int xfs_attr_leaf_addname(struct xfs_delattr_context *dac); STATIC int xfs_attr_leaf_removename(xfs_da_args_t *args); STATIC int xfs_attr_leaf_hasname(struct xfs_da_args *args, struct xfs_buf **bp);
@@ -52,12 +52,15 @@ STATIC int xfs_attr_leaf_hasname(struct xfs_da_args *args, struct xfs_buf **bp);* 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); +STATIC int xfs_attr_node_addname(struct xfs_delattr_context *dac); STATIC int xfs_attr_node_removename_iter(struct xfs_delattr_context *dac); STATIC int xfs_attr_node_hasname(xfs_da_args_t *args,struct xfs_da_state **state); STATIC int xfs_attr_fillstate(xfs_da_state_t *state); STATIC int xfs_attr_refillstate(xfs_da_state_t *state); +STATIC int xfs_attr_leaf_try_add(struct xfs_da_args *args, struct xfs_buf *bp); +STATIC int xfs_attr_set_iter(struct xfs_delattr_context *dac, +struct xfs_buf **leaf_bp);int xfs_inode_hasattr(
@@ -218,8 +221,11 @@ xfs_attr_is_shortform(/* * Attempts to set an attr in shortform, or converts short form to leaf form if -* there is not enough room. If the attr is set, the transaction is committed -* and set to NULL. +* there is not enough room. This function is meant to operate as a helper +* routine to the delayed attribute functions. It returns -EAGAIN to indicate +* that the calling function should roll the transaction, and then proceed to +* add the attr in leaf form. This subroutine does not expect to be recalled +* again like the other delayed attr routines do. */ STATIC int xfs_attr_set_shortform(
@@ -227,16 +233,16 @@ xfs_attr_set_shortform( struct xfs_buf **leaf_bp) {struct xfs_inode *dp = args->dp; -int error, error2 =0 ; +int error =0 ;/* * Try to add the attr to the attribute list in the inode. */ error =xfs_attr_try_sf_addname (dp, args); + +/* Should only be 0, -EEXIST or ENOSPC */ if (error != -ENOSPC ) { - error2 =xfs_trans_commit (args->trans); - args->trans =NULL ; -return error ? error : error2; +return error; }/* * It won't fit in the shortform, transform to a leaf block. GROT:
@@ -249,18 +255,10 @@ xfs_attr_set_shortform(/* * Prevent the leaf buffer from being unlocked so that a concurrent AIL * push cannot grab the half-baked leaf buffer and run into problems -* with the write verifier. Once we're done rolling the transaction we -* can release the hold and add the attr to the leaf. +* with the write verifier. */ xfs_trans_bhold (args->trans, *leaf_bp); - error =xfs_defer_finish (&args->trans); -xfs_trans_bhold_release (args->trans, *leaf_bp); -if (error) { -xfs_trans_brelse (args->trans, *leaf_bp); -return error; - } - -return 0 ; +return -EAGAIN ; }/*
@@ -268,7 +266,7 @@ xfs_attr_set_shortform(* also checks for a defer finish. Transaction is finished and rolled as * needed, and returns true of false if the delayed operation should continue. */ -int +STATIC intxfs_attr_trans_roll (struct xfs_delattr_context *dac) {
@@ -297,61 +295,130 @@ intxfs_attr_set_args ( struct xfs_da_args *args) { -struct xfs_inode *dp = args->dp; -struct xfs_buf *leaf_bp =NULL ; -int error =0 ; +struct xfs_buf *leaf_bp =NULL ; +int error =0 ; +struct xfs_delattr_context dac = { + .da_args = args, + }; + +do { + error =xfs_attr_set_iter (&dac, &leaf_bp); +if (error != -EAGAIN ) +break ; + + error =xfs_attr_trans_roll (&dac); +if (error) +return error; + +if (leaf_bp) { +xfs_trans_bjoin (args->trans, leaf_bp); +xfs_trans_bhold (args->trans, leaf_bp); + } + + }while (true); + +return error; +} + +/* +* Set the attribute specified in @args. +* This routine is meant to function as a delayed operation, and may return +* -EAGAIN when the transaction needs to be rolled. Calling functions will need +* to handle this, and recall the function until a successful error code is +* returned. +*/ +STATIC int +xfs_attr_set_iter ( +struct xfs_delattr_context *dac, +struct xfs_buf **leaf_bp) +{ +struct xfs_da_args *args = dac->da_args; +struct xfs_inode *dp = args->dp; +int error =0 ; + +/* State machine switch */ +switch (dac->dela_state) { +case XFS_DAS_FLIP_LFLAG : +case XFS_DAS_FOUND_LBLK : + goto das_leaf; +case XFS_DAS_FOUND_NBLK : +case XFS_DAS_FLIP_NFLAG : +case XFS_DAS_ALLOC_NODE : + goto das_node; +default : +break ; + }/* * If the attribute list is already in leaf format, jump straight to * leaf handling. Otherwise, try to add the attribute to the shortform * list; if there's no room then convert the list to leaf format and try -* again. +* again. No need to set state as we will be in leaf form when we come +* back */ if (xfs_attr_is_shortform (dp)) {/* -* If the attr was successfully set in shortform, the -* transaction is committed and set to NULL. Otherwise, is it -* converted from shortform to leaf, and the transaction is -* retained. +* If the attr was successfully set in shortform, no need to +* continue. Otherwise, is it converted from shortform to leaf +* and -EAGAIN is returned. */ - error =xfs_attr_set_shortform (args, &leaf_bp); -if (error || !args->trans) -return error; + error =xfs_attr_set_shortform (args, leaf_bp); +if (error == -EAGAIN ) + dac->flags |=XFS_DAC_DEFER_FINISH ; + +return error; } -if (xfs_bmap_one_block (dp,XFS_ATTR_FORK )) { - error =xfs_attr_leaf_addname (args); -if (error != -ENOSPC ) -return error; +/* +* After a shortform to leaf conversion, we need to hold the leaf and +* cycle out the transaction. When we get back, we need to release +* the leaf. +*/ +if (*leaf_bp !=NULL ) { +xfs_trans_bhold_release (args->trans, *leaf_bp); + *leaf_bp =NULL ; + } -/* -* Promote the attribute list to the Btree format. -*/ - error =xfs_attr3_leaf_to_node (args); -if (error) -return error; +if (xfs_bmap_one_block (dp,XFS_ATTR_FORK )) { + error =xfs_attr_leaf_try_add (args, *leaf_bp); +switch (error) { +case -ENOSPC : +/* +* Promote the attribute list to the Btree format. +*/ + error =xfs_attr3_leaf_to_node (args); +if (error) +return error; -/* -* Finish any deferred work items and roll the transaction once -* more. The goal here is to call node_addname with the inode -* and transaction in the same state (inode locked and joined, -* transaction clean) no matter how we got to this step. -*/ - error =xfs_defer_finish (&args->trans); -if (error) +/* +* Finish any deferred work items and roll the +* transaction once more. The goal here is to call +* node_addname with the inode and transaction in the +* same state (inode locked and joined, transaction +* clean) no matter how we got to this step. +*/ + dac->flags |=XFS_DAC_DEFER_FINISH ; +return -EAGAIN ; +case 0 : + dac->dela_state =XFS_DAS_FOUND_LBLK ; +return -EAGAIN ; +default :return error; + } +das_leaf: + error =xfs_attr_leaf_addname (dac); +if (error == -ENOSPC ) +/* +* No need to set state. We will be in node form when +* we are recalled +*/ +return -EAGAIN ; -/* -* Commit the current trans (including the inode) and -* start a new one. -*/ - error =xfs_trans_roll_inode (&args->trans, dp); -if (error) -return error; +return error; } - - error =xfs_attr_node_addname (args); +das_node: + error =xfs_attr_node_addname (dac);return error; }
@@ -715,28 +782,30 @@ out_brelse:* * This leaf block cannot have a "remote" value, we only call this routine * if bmap_one_block() says there is only one block (ie: no remote blks). +* +* This routine is meant to function as a delayed operation, and may return +* -EAGAIN when the transaction needs to be rolled. Calling functions will need +* to handle this, and recall the function until a successful error code is +* returned. */ STATIC intxfs_attr_leaf_addname ( -struct xfs_da_args *args) +struct xfs_delattr_context *dac) { -int error, forkoff; -struct xfs_buf *bp =NULL ; -struct xfs_inode *dp = args->dp; - -trace_xfs_attr_leaf_addname (args); - - error =xfs_attr_leaf_try_add (args, bp); -if (error) -return error; +struct xfs_da_args *args = dac->da_args; +struct xfs_buf *bp =NULL ; +int error, forkoff; +struct xfs_inode *dp = args->dp; -/* -* 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; +/* State machine switch */ +switch (dac->dela_state) { +case XFS_DAS_FLIP_LFLAG : + goto das_flip_flag; +case XFS_DAS_RM_LBLK : + goto das_rm_lblk; +default : +break ; + }/* * If there was an out-of-line value, allocate the blocks we
@@ -744,12 +813,34 @@ xfs_attr_leaf_addname(* 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); + +/* Open coded xfs_attr_rmtval_set without trans handling */ +if ((dac->flags &XFS_DAC_LEAF_ADDNAME_INIT ) ==0 ) { + dac->flags |=XFS_DAC_LEAF_ADDNAME_INIT ; +if (args->rmtblkno >0 ) { + error =xfs_attr_rmtval_find_space (dac); +if (error) +return error; + } + } + +/* +* Roll through the "value", allocating blocks on disk as +* required. +*/ +if (dac->blkcnt >0 ) { + error =xfs_attr_rmtval_set_blk (dac);if (error)return error; + + dac->flags |=XFS_DAC_DEFER_FINISH ; +return -EAGAIN ; } + error =xfs_attr_rmtval_set_value (args); +if (error) +return error; +if (!(args->op_flags &XFS_DA_OP_RENAME )) {/* * Added a "remote" value, just clear the incomplete flag.
@@ -769,29 +860,29 @@ 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);if (error)return error;/* * Commit the flag value change and start the next trans in series. */ - error =xfs_trans_roll_inode (&args->trans, args->dp); -if (error) -return error; - + dac->dela_state =XFS_DAS_FLIP_LFLAG ; +return -EAGAIN ; +das_flip_flag:/* * Dismantle the "old" attribute/value pair by removing a "remote" value * (if it exists). */ xfs_attr_restore_rmt_blk (args); + error =xfs_attr_rmtval_invalidate (args); +if (error) +return error; +das_rm_lblk:if (args->rmtblkno) { - error =xfs_attr_rmtval_invalidate (args); -if (error) -return error; - - error =xfs_attr_rmtval_remove (args); + error =__xfs_attr_rmtval_remove (dac); +if (error == -EAGAIN ) + dac->dela_state =XFS_DAS_RM_LBLK ;if (error)return error; }
@@ -957,23 +1048,38 @@ xfs_attr_node_hasname(* * "Remote" attribute values confuse the issue and atomic rename operations * add a whole extra layer of confusion on top of that. +* +* This routine is meant to function as a delayed operation, and may return +* -EAGAIN when the transaction needs to be rolled. Calling functions will need +* to handle this, and recall the function until a successful error code is +*returned. */ STATIC intxfs_attr_node_addname ( -struct xfs_da_args *args) +struct xfs_delattr_context *dac) { -struct xfs_da_state *state; -struct xfs_da_state_blk *blk; -struct xfs_inode *dp; -int retval, error; +struct xfs_da_args *args = dac->da_args; +struct xfs_da_state *state =NULL ; +struct xfs_da_state_blk *blk; +int retval =0 ; +int error =0 ;trace_xfs_attr_node_addname (args); -/* -* Fill in bucket of arguments/results/context to carry around. -*/ - dp = args->dp; -restart: +/* State machine switch */ +switch (dac->dela_state) { +case XFS_DAS_FLIP_NFLAG : + goto das_flip_flag; +case XFS_DAS_FOUND_NBLK : + goto das_found_nblk; +case XFS_DAS_ALLOC_NODE : + goto das_alloc_node; +case XFS_DAS_RM_NBLK : + goto das_rm_nblk; +default : +break ; + } +/* * Search to see if name already exists, and get back a pointer * to where it should go.
@@ -1019,19 +1125,13 @@ restart: error =xfs_attr3_leaf_to_node (args);if (error) goto out; - error =xfs_defer_finish (&args->trans); -if (error) - goto out;/* -* Commit the node conversion and start the next -* trans in the chain. +* Restart routine from the top. No need to set the +* state */ - error =xfs_trans_roll_inode (&args->trans, dp); -if (error) - goto out; - - goto restart; + dac->flags |=XFS_DAC_DEFER_FINISH ; +return -EAGAIN ; }/*
@@ -1043,9 +1143,7 @@ restart: error =xfs_da3_split (state);if (error) goto out; - error =xfs_defer_finish (&args->trans); -if (error) - goto out; + dac->flags |=XFS_DAC_DEFER_FINISH ; }else {/* * Addition succeeded, update Btree hashvals.
@@ -1060,13 +1158,9 @@ restart:xfs_da_state_free (state); state =NULL ; -/* -* Commit the leaf addition or btree split and start the next -* trans in the chain. -*/ - error =xfs_trans_roll_inode (&args->trans, dp); -if (error) - goto out; + dac->dela_state =XFS_DAS_FOUND_NBLK ; +return -EAGAIN ; +das_found_nblk:/* * If there was an out-of-line value, allocate the blocks we
@@ -1075,7 +1169,27 @@ restart:* maximum size of a transaction and/or hit a deadlock. */ if (args->rmtblkno >0 ) { - error =xfs_attr_rmtval_set (args); +/* Open coded xfs_attr_rmtval_set without trans handling */ + error =xfs_attr_rmtval_find_space (dac); +if (error) +return error; + +/* +* Roll through the "value", allocating blocks on disk as +* required. +*/ +das_alloc_node: +if (dac->blkcnt >0 ) { + error =xfs_attr_rmtval_set_blk (dac); +if (error) +return error; + + dac->flags |=XFS_DAC_DEFER_FINISH ; + dac->dela_state =XFS_DAS_ALLOC_NODE ; +return -EAGAIN ; + } + + error =xfs_attr_rmtval_set_value (args);if (error)return error; }
@@ -1105,22 +1219,28 @@ restart:/* * Commit the flag value change and start the next trans in series */ - error =xfs_trans_roll_inode (&args->trans, args->dp); -if (error) - goto out; - + dac->dela_state =XFS_DAS_FLIP_NFLAG ; +return -EAGAIN ; +das_flip_flag:/* * Dismantle the "old" attribute/value pair by removing a "remote" value * (if it exists). */ xfs_attr_restore_rmt_blk (args); + error =xfs_attr_rmtval_invalidate (args); +if (error) +return error; + +das_rm_nblk:if (args->rmtblkno) { - error =xfs_attr_rmtval_invalidate (args); -if (error) -return error; + error =__xfs_attr_rmtval_remove (dac); + +if (error == -EAGAIN ) { + dac->dela_state =XFS_DAS_RM_NBLK ; +return -EAGAIN ; + } - error =xfs_attr_rmtval_remove (args);if (error)return error; }
libxfs/xfs_attr.h +125 -1
156 lines not on this page · raw message
libxfs/xfs_attr_remote.c +65 -33
122 lines not on this page · raw message
libxfs/xfs_attr_remote.h +4 -0
@@ -15,4 +15,8 @@ int xfs_attr_rmtval_stale(struct xfs_inode *ip, struct xfs_bmbt_irec *map, xfs_buf_flags_t incore_flags);int xfs_attr_rmtval_invalidate (struct xfs_da_args *args);int __xfs_attr_rmtval_remove (struct xfs_delattr_context *dac); +int xfs_attr_rmt_find_hole (struct xfs_da_args *args); +int xfs_attr_rmtval_set_value (struct xfs_da_args *args); +int xfs_attr_rmtval_set_blk (struct xfs_delattr_context *dac); +int xfs_attr_rmtval_find_space (struct xfs_delattr_context *dac);#endif /* __XFS_ATTR_REMOTE_H__ */
Signature · 1 line
2.7.4
PATCH v13 6/14 xfsprogs: Rename __xfs_attr_rmtval_remove
In reply to Allison HendersonFrom: Allison Collins <[email protected]>
Now that xfs_attr_rmtval_remove is gone, rename __xfs_attr_rmtval_remove to xfs_attr_rmtval_remove
--- libxfs/xfs_attr.c | 7 +++---- libxfs/xfs_attr_remote.c | 2 +- libxfs/xfs_attr_remote.h | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-)
libxfs/xfs_attr.c +3 -4
@@ -880,7 +880,7 @@ das_flip_flag:return error; das_rm_lblk:if (args->rmtblkno) { - error =__xfs_attr_rmtval_remove (dac); + error =xfs_attr_rmtval_remove (dac);if (error == -EAGAIN ) dac->dela_state =XFS_DAS_RM_LBLK ;if (error)
@@ -1234,8 +1234,7 @@ das_flip_flag: das_rm_nblk:if (args->rmtblkno) { - error =__xfs_attr_rmtval_remove (dac); - + error =xfs_attr_rmtval_remove (dac);if (error == -EAGAIN ) { dac->dela_state =XFS_DAS_RM_NBLK ;return -EAGAIN ;
@@ -1389,7 +1388,7 @@ xfs_attr_node_remove_rmt (/* * May return -EAGAIN to request that the caller recall this function */ - error =__xfs_attr_rmtval_remove (dac); + error =xfs_attr_rmtval_remove (dac);if (error)return error;
libxfs/xfs_attr_remote.c +1 -1
@@ -738,7 +738,7 @@ xfs_attr_rmtval_invalidate(* transaction and re-call the function */ int -__xfs_attr_rmtval_remove ( +xfs_attr_rmtval_remove (struct xfs_delattr_context *dac) {struct xfs_da_args *args = dac->da_args;
libxfs/xfs_attr_remote.h +1 -2
@@ -10,11 +10,10 @@ 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); -int xfs_attr_rmtval_remove (struct xfs_da_args *args);int xfs_attr_rmtval_stale (struct xfs_inode *ip,struct xfs_bmbt_irec *map,xfs_buf_flags_t incore_flags);int xfs_attr_rmtval_invalidate (struct xfs_da_args *args); -int __xfs_attr_rmtval_remove (struct xfs_delattr_context *dac); +int xfs_attr_rmtval_remove (struct xfs_delattr_context *dac);int xfs_attr_rmt_find_hole (struct xfs_da_args *args);int xfs_attr_rmtval_set_value (struct xfs_da_args *args);int xfs_attr_rmtval_set_blk (struct xfs_delattr_context *dac);
Signature · 1 line
2.7.4
PATCH v13 7/14 xfsprogs: Set up infastructure for deferred attribute operations
In reply to Allison HendersonFrom: Allison Collins <[email protected]>
Currently attributes are modified directly across one or more transactions. But they are not logged or replayed in the event of an error. The goal of delayed attributes is to enable logging and replaying of attribute operations using the existing delayed operations infrastructure. This will later enable the attributes to become part of larger multi part operations that also must first be recorded to the log. This is mostly of interest in the scheme of parent pointers which would need to maintain an attribute containing parent inode information any time an inode is moved, created, or removed. Parent pointers would then be of interest to any feature that would need to quickly derive an inode path from the mount point. Online scrub, nfs lookups and fs grow or shrink operations are all features that could take advantage of this.
This patch adds two new log item types for setting or removing attributes as deferred operations. The xfs_attri_log_item logs an intent to set or remove an attribute. The corresponding xfs_attrd_log_item holds a reference to the xfs_attri_log_item and is freed once the transaction is done. Both log items use a generic xfs_attr_log_format structure that contains the attribute name, value, flags, inode, and an op_flag that indicates if the operations is a set or remove.
--- libxfs/defer_item.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++ libxfs/libxfs_priv.h | 1 + libxfs/xfs_attr.c | 7 ++- libxfs/xfs_attr.h | 19 +++++++ libxfs/xfs_defer.c | 1 + libxfs/xfs_defer.h | 2 + libxfs/xfs_format.h | 5 ++ libxfs/xfs_log_format.h | 43 +++++++++++++++- libxfs/xfs_types.h | 1 + 9 files changed, 205 insertions(+), 6 deletions(-)
libxfs/defer_item.c +132 -0
@@ -16,10 +16,14 @@#include "xfs_trans.h" #include "xfs_bmap.h" #include "xfs_alloc.h" +#include "xfs_attr_item.h" #include "xfs_rmap.h" #include "xfs_refcount.h" #include "xfs_bmap.h" #include "xfs_inode.h" +#include "xfs_da_format.h" +#include "xfs_da_btree.h" +#include "xfs_attr.h" /* Dummy defer item ops, since we don't do logging. */
@@ -112,6 +116,134 @@ const struct xfs_defer_op_type xfs_extent_free_defer_type = { .cancel_item = xfs_extent_free_cancel_item, }; +static inline struct xfs_attrd_log_item *ATTRD_ITEM (struct xfs_log_item *lip) +{ + return container_of(lip, struct xfs_attrd_log_item, attrd_item); +} + +/* +* Log an ATTRI it to the ATTRD when the attr op is done. An attr operation +* may be a set or a remove. Note that the transaction is marked dirty +* regardless of whether the operation succeeds or fails to support the +* ATTRI/ATTRD lifecycle rules. +*/ +int +xfs_trans_attr ( +struct xfs_delattr_context *dac, +struct xfs_attrd_log_item *attrdp, +struct xfs_buf **leaf_bp, +uint32_t op_flags) +{ +struct xfs_da_args *args = dac->da_args; +int error; + + error =xfs_qm_dqattach_locked (args->dp,0 ); +if (error) +return error; + +switch (op_flags) { +case XFS_ATTR_OP_FLAGS_SET : + args->op_flags |=XFS_DA_OP_ADDNAME ; + error =xfs_attr_set_iter (dac, leaf_bp); +break ; +case XFS_ATTR_OP_FLAGS_REMOVE : +ASSERT (XFS_IFORK_Q ((args->dp))); + error =xfs_attr_remove_iter (dac); +break ; +default : + error = -EFSCORRUPTED ; +break ; + } + +/* +* Mark the transaction dirty, even on error. This ensures the +* transaction is aborted, which: +* +* 1.) releases the ATTRI and frees the ATTRD +* 2.) shuts down the filesystem +*/ + args->trans->t_flags |=XFS_TRANS_DIRTY ; + +return error; +} + +/* Get an ATTRI. */ +static struct xfs_log_item * +xfs_attr_create_intent ( +struct xfs_trans *tp, +struct list_head *items, +unsigned int count, +bool sort) +{ +return NULL ; +} + +/* Abort all pending ATTRs. */ +STATIC void +xfs_attr_abort_intent ( +struct xfs_log_item *intent) +{ +} + +/* Get an ATTRD so we can process all the attrs. */ +static struct xfs_log_item * +xfs_attr_create_done ( +struct xfs_trans *tp, +struct xfs_log_item *intent, +unsigned int count) +{ +return NULL ; +} + +/* Process an attr. */ +STATIC int +xfs_attr_finish_item ( +struct xfs_trans *tp, +struct xfs_log_item *done, +struct list_head *item, +struct xfs_btree_cur **state) +{ +struct xfs_attr_item *attr; +int error; +struct xfs_delattr_context *dac; + + attr = container_of(item, struct xfs_attr_item, xattri_list); + dac = &attr->xattri_dac; + +/* +* Always reset trans after EAGAIN cycle +* since the transaction is new +*/ + dac->da_args->trans = tp; + + error =xfs_trans_attr (dac,ATTRD_ITEM (done), &dac->leaf_bp, + attr->xattri_op_flags); +if (error != -EAGAIN ) +kmem_free (attr); + +return error; +} + +/* Cancel an attr */ +STATIC void +xfs_attr_cancel_item ( +struct list_head *item) +{ +struct xfs_attr_item *attr; + + attr = container_of(item, struct xfs_attr_item, xattri_list); +kmem_free (attr); +} + +const struct xfs_defer_op_type xfs_attr_defer_type = { + .max_items =1 , + .create_intent = xfs_attr_create_intent, + .abort_intent = xfs_attr_abort_intent, + .create_done = xfs_attr_create_done, + .finish_item = xfs_attr_finish_item, + .cancel_item = xfs_attr_cancel_item, +}; +/* * AGFL blocks are accounted differently in the reserve pools and are not * inserted into the busy extent list.
libxfs/libxfs_priv.h +1 -0
@@ -499,6 +499,7 @@ void __xfs_buf_mark_corrupt(struct xfs_buf *bp, xfs_failaddr_t fa);#define xfs_trans_reserve_quota_nblks (t,i,b,n,f) (0)#define xfs_trans_unreserve_quota_nblks (t,i,b,n,f) ((void) 0)#define xfs_qm_dqattach (i) (0) +#define xfs_qm_dqattach_locked (i,b) (0)#define uuid_copy (s,d) platform_uuid_copy((s),(d))#define uuid_equal (s,d) (platform_uuid_compare((s),(d)) == 0)
libxfs/xfs_attr.c +3 -4
@@ -24,6 +24,7 @@#include "xfs_quota_defs.h" #include "xfs_trans_space.h" #include "xfs_trace.h" +#include "xfs_attr_item.h" /* * xfs_attr.c
@@ -59,8 +60,6 @@ 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); STATIC int xfs_attr_leaf_try_add(struct xfs_da_args *args, struct xfs_buf *bp); -STATIC int xfs_attr_set_iter(struct xfs_delattr_context *dac, -struct xfs_buf **leaf_bp);int xfs_inode_hasattr(
@@ -142,7 +141,7 @@ xfs_attr_get(/* * Calculate how many blocks we need for the new attribute, */ -STATIC int +int xfs_attr_calc_size (struct xfs_da_args *args,int *local)
@@ -327,7 +326,7 @@ xfs_attr_set_args(* to handle this, and recall the function until a successful error code is * returned. */ -STATIC int +int xfs_attr_set_iter (struct xfs_delattr_context *dac,struct xfs_buf **leaf_bp)
libxfs/xfs_attr.h +19 -0
@@ -247,6 +247,7 @@ enum xfs_delattr_state {#define XFS_DAC_DEFER_FINISH 0x01/* finish the transaction */ #define XFS_DAC_NODE_RMVNAME_INIT 0x02/* xfs_attr_node_removename init */ #define XFS_DAC_LEAF_ADDNAME_INIT 0x04/* xfs_attr_leaf_addname init*/ +#define XFS_DAC_DELAYED_OP_INIT 0x08/* delayed operations init*/ /* * Context used for keeping track of delayed attribute operations
@@ -254,6 +255,9 @@ enum xfs_delattr_state {struct xfs_delattr_context {struct xfs_da_args *da_args; +/* Used by delayed attributes to hold leaf across transactions */ +struct xfs_buf *leaf_bp; +/* Used in xfs_attr_rmtval_set_blk to roll through allocating blocks */ struct xfs_bmbt_irec map;xfs_dablk_t lblkno;
@@ -267,6 +271,18 @@ struct xfs_delattr_context {enum xfs_delattr_state dela_state; }; +/* +* List of attrs to commit later. +*/ +struct xfs_attr_item { +struct xfs_delattr_context xattri_dac; +uint32_t xattri_op_flags;/* attr op set or rm */ + +/* used to log this item to an intent */ +struct list_head xattri_list; +}; + +/*======================================================================== * Function prototypes for the kernel. *========================================================================*/
@@ -282,11 +298,14 @@ int xfs_attr_get_ilocked(struct xfs_da_args *args);int xfs_attr_get (struct xfs_da_args *args);int xfs_attr_set (struct xfs_da_args *args);int xfs_attr_set_args (struct xfs_da_args *args); +int xfs_attr_set_iter (struct xfs_delattr_context *dac, +struct xfs_buf **leaf_bp);int xfs_has_attr (struct xfs_da_args *args);int xfs_attr_remove_args (struct xfs_da_args *args);int xfs_attr_remove_iter (struct xfs_delattr_context *dac);bool xfs_attr_namecheck (const void *name,size_t length);void xfs_delattr_context_init (struct xfs_delattr_context *dac,struct xfs_da_args *args); +int xfs_attr_calc_size (struct xfs_da_args *args,int *local);#endif /* __XFS_ATTR_H__ */
libxfs/xfs_defer.c +1 -0
@@ -174,6 +174,7 @@ static const struct xfs_defer_op_type *defer_op_types[] = { [XFS_DEFER_OPS_TYPE_RMAP] = &xfs_rmap_update_defer_type, [XFS_DEFER_OPS_TYPE_FREE] = &xfs_extent_free_defer_type, [XFS_DEFER_OPS_TYPE_AGFL_FREE] = &xfs_agfl_free_defer_type, + [XFS_DEFER_OPS_TYPE_ATTR] = &xfs_attr_defer_type, }; static void
libxfs/xfs_defer.h +2 -0
@@ -18,6 +18,7 @@ enum xfs_defer_ops_type {XFS_DEFER_OPS_TYPE_RMAP ,XFS_DEFER_OPS_TYPE_FREE ,XFS_DEFER_OPS_TYPE_AGFL_FREE , +XFS_DEFER_OPS_TYPE_ATTR , XFS_DEFER_OPS_TYPE_MAX, };
@@ -62,5 +63,6 @@ extern const struct xfs_defer_op_type xfs_refcount_update_defer_type;extern const struct xfs_defer_op_type xfs_rmap_update_defer_type;extern const struct xfs_defer_op_type xfs_extent_free_defer_type;extern const struct xfs_defer_op_type xfs_agfl_free_defer_type; +extern const struct xfs_defer_op_type xfs_attr_defer_type;#endif /* __XFS_DEFER_H__ */
libxfs/xfs_format.h +5 -0
@@ -565,6 +565,11 @@ static inline bool xfs_sb_version_hasreflink(struct xfs_sb *sbp) (sbp->sb_features_ro_compat &XFS_SB_FEAT_RO_COMPAT_REFLINK ); } +static inline bool xfs_sb_version_hasdelattr (struct xfs_sb *sbp) +{ +return false; +} +/* * Inode btree block counter. We record the number of inobt and finobt blocks * in the AGI header so that we can skip the finobt walk at mount time when
libxfs/xfs_log_format.h +41 -2
65 lines not on this page · raw message
libxfs/xfs_types.h +1 -0
@@ -11,6 +11,7 @@ typedef uint32_t prid_t; /* project ID */typedef uint32_t xfs_agblock_t ;/* blockno in alloc. group */ typedef uint32_t xfs_agino_t ;/* inode # within allocation grp */ typedef uint32_t xfs_extlen_t ;/* extent length in blocks */ +typedef uint32_t xfs_attrlen_t ;/* attr length */ typedef uint32_t xfs_agnumber_t ;/* allocation group number */ typedef int32_t xfs_extnum_t ;/* # of extents in a file */ typedef int16_t xfs_aextnum_t ;/* # extents in an attribute fork */
Signature · 1 line
2.7.4
PATCH v13 8/14 xfsprogs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred
In reply to Allison HendersonFrom: Allison Collins <[email protected]>
These routines to set up and start a new deferred attribute operations. These functions are meant to be called by any routine needing to initiate a deferred attribute operation as opposed to the existing inline operations. New helper function xfs_attr_item_init also added.
--- libxfs/xfs_attr.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ libxfs/xfs_attr.h | 2 ++ 2 files changed, 55 insertions(+)
libxfs/xfs_attr.c +53 -0
@@ -643,6 +643,59 @@ out_trans_cancel: goto out_unlock; } +STATIC int +xfs_attr_item_init ( +struct xfs_da_args *args, +unsigned int op_flags,/* op flag (set or remove) */ +struct xfs_attr_item **attr)/* new xfs_attr_item */ +{ + +struct xfs_attr_item *new; + + new =kmem_alloc_large (sizeof (struct xfs_attr_item ),KM_NOFS ); +memset (new,0 ,sizeof (struct xfs_attr_item )); + new->xattri_op_flags = op_flags; + new->xattri_dac.da_args = args; + + *attr = new; +return 0 ; +} + +/* Sets an attribute for an inode as a deferred operation */ +int +xfs_attr_set_deferred ( +struct xfs_da_args *args) +{ +struct xfs_attr_item *new; +int error =0 ; + + error =xfs_attr_item_init (args,XFS_ATTR_OP_FLAGS_SET , &new); +if (error) +return error; + +xfs_defer_add (args->trans,XFS_DEFER_OPS_TYPE_ATTR , &new->xattri_list); + +return 0 ; +} + +/* Removes an attribute for an inode as a deferred operation */ +int +xfs_attr_remove_deferred ( +struct xfs_da_args *args) +{ + +struct xfs_attr_item *new; +int error; + + error =xfs_attr_item_init (args,XFS_ATTR_OP_FLAGS_REMOVE , &new); +if (error) +return error; + +xfs_defer_add (args->trans,XFS_DEFER_OPS_TYPE_ATTR , &new->xattri_list); + +return 0 ; +} +/*======================================================================== * External routines when attribute list is inside the inode *========================================================================*/
libxfs/xfs_attr.h +2 -0
@@ -307,5 +307,7 @@ bool xfs_attr_namecheck(const void *name, size_t length);void xfs_delattr_context_init (struct xfs_delattr_context *dac,struct xfs_da_args *args);int xfs_attr_calc_size (struct xfs_da_args *args,int *local); +int xfs_attr_set_deferred (struct xfs_da_args *args); +int xfs_attr_remove_deferred (struct xfs_da_args *args);#endif /* __XFS_ATTR_H__ */
Signature · 1 line
2.7.4
PATCH v13 9/14 xfsprogs: Add feature bit XFS_SB_FEAT_INCOMPAT_LOG_DELATTR
In reply to Allison HendersonThis patch adds a new feature bit XFS_SB_FEAT_INCOMPAT_LOG_DELATTR which can be used to control turning on/off delayed attributes
--- libxfs/xfs_format.h | 8 ++++++-- libxfs/xfs_fs.h | 1 + libxfs/xfs_sb.c | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-)
libxfs/xfs_format.h +6 -2
@@ -481,7 +481,9 @@ xfs_sb_has_incompat_feature(return (sbp->sb_features_incompat & feature) !=0 ; } -#define XFS_SB_FEAT_INCOMPAT_LOG_ALL 0 +#define XFS_SB_FEAT_INCOMPAT_LOG_DELATTR (1 << 0)/* Delayed Attributes */ +#define XFS_SB_FEAT_INCOMPAT_LOG_ALL \ + (XFS_SB_FEAT_INCOMPAT_LOG_DELATTR)#define XFS_SB_FEAT_INCOMPAT_LOG_UNKNOWN ~XFS_SB_FEAT_INCOMPAT_LOG_ALLstatic inline bool xfs_sb_has_incompat_log_feature(
@@ -567,7 +569,9 @@ static inline bool xfs_sb_version_hasreflink(struct xfs_sb *sbp)static inline bool xfs_sb_version_hasdelattr (struct xfs_sb *sbp) { -return false; +return (XFS_SB_VERSION_NUM (sbp) ==XFS_SB_VERSION_5 && + (sbp->sb_features_log_incompat & +XFS_SB_FEAT_INCOMPAT_LOG_DELATTR )); }/*
libxfs/xfs_fs.h +1 -0
@@ -249,6 +249,7 @@ typedef struct xfs_fsop_resblks {#define XFS_FSOP_GEOM_FLAGS_SPINODES (1 << 18)/* sparse inode chunks */ #define XFS_FSOP_GEOM_FLAGS_RMAPBT (1 << 19)/* reverse mapping btree */ #define XFS_FSOP_GEOM_FLAGS_REFLINK (1 << 20)/* files can share blocks */ +#define XFS_FSOP_GEOM_FLAGS_DELATTR (1 << 22)/* delayed attributes */ /* * Minimum and maximum sizes need for growth checks.
libxfs/xfs_sb.c +2 -0
@@ -1143,6 +1143,8 @@ xfs_fs_geometry( geo->flags |=XFS_FSOP_GEOM_FLAGS_RMAPBT ;if (xfs_sb_version_hasreflink (sbp)) geo->flags |=XFS_FSOP_GEOM_FLAGS_REFLINK ; +if (xfs_sb_version_hasdelattr (sbp)) + geo->flags |=XFS_FSOP_GEOM_FLAGS_DELATTR ;if (xfs_sb_version_hassector (sbp)) geo->logsectsize = sbp->sb_logsectsize;else
Signature · 1 line
2.7.4
PATCH v13 10/14 xfsprogs: Enable delayed attributes
In reply to Allison HendersonFrom: Allison Collins <[email protected]>
Finally enable delayed attributes in xfs_attr_set and xfs_attr_remove.
--- libxfs/xfs_attr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
libxfs/xfs_attr.c +3 -2
@@ -602,9 +602,10 @@ xfs_attr_set(if (error != -ENOATTR && error != -EEXIST ) goto out_trans_cancel; - error =xfs_attr_set_args (args); + error =xfs_attr_set_deferred (args);if (error) goto out_trans_cancel; +/* shortform attribute has already been committed */ if (!args->trans) goto out_unlock;
@@ -613,7 +614,7 @@ xfs_attr_set(if (error != -EEXIST ) goto out_trans_cancel; - error =xfs_attr_remove_args (args); + error =xfs_attr_remove_deferred (args);if (error) goto out_trans_cancel; }
Signature · 1 line
2.7.4
PATCH v13 11/14 xfsprogs: Remove unused xfs_attr_*_args
In reply to Allison HendersonRemove xfs_attr_set_args, xfs_attr_remove_args, and xfs_attr_trans_roll. These high level loops are now driven by the delayed operations code, and can be removed.
--- libxfs/xfs_attr.c | 97 +------------------------------------------------------ libxfs/xfs_attr.h | 2 -- 2 files changed, 1 insertion(+), 98 deletions(-)
libxfs/xfs_attr.c +1 -96
@@ -261,65 +261,6 @@ xfs_attr_set_shortform( }/* -* Checks to see if a delayed attribute transaction should be rolled. If so, -* also checks for a defer finish. Transaction is finished and rolled as -* needed, and returns true of false if the delayed operation should continue. -*/ -STATIC int -xfs_attr_trans_roll ( -struct xfs_delattr_context *dac) -{ -struct xfs_da_args *args = dac->da_args; -int error =0 ; - -if (dac->flags &XFS_DAC_DEFER_FINISH ) { -/* -* The caller wants us to finish all the deferred ops so that we -* avoid pinning the log tail with a large number of deferred -* ops. -*/ - dac->flags &= ~XFS_DAC_DEFER_FINISH ; - error =xfs_defer_finish (&args->trans); -if (error) -return error; - } - -return xfs_trans_roll_inode (&args->trans, args->dp); -} - -/* -* Set the attribute specified in @args. -*/ -int -xfs_attr_set_args ( -struct xfs_da_args *args) -{ -struct xfs_buf *leaf_bp =NULL ; -int error =0 ; -struct xfs_delattr_context dac = { - .da_args = args, - }; - -do { - error =xfs_attr_set_iter (&dac, &leaf_bp); -if (error != -EAGAIN ) -break ; - - error =xfs_attr_trans_roll (&dac); -if (error) -return error; - -if (leaf_bp) { -xfs_trans_bjoin (args->trans, leaf_bp); -xfs_trans_bhold (args->trans, leaf_bp); - } - - }while (true); - -return error; -} - -/* * Set the attribute specified in @args. * This routine is meant to function as a delayed operation, and may return * -EAGAIN when the transaction needs to be rolled. Calling functions will need
@@ -362,11 +303,7 @@ xfs_attr_set_iter(* continue. Otherwise, is it converted from shortform to leaf * and -EAGAIN is returned. */ - error =xfs_attr_set_shortform (args, leaf_bp); -if (error == -EAGAIN ) - dac->flags |=XFS_DAC_DEFER_FINISH ; - -return error; +return xfs_attr_set_shortform (args, leaf_bp); }/*
@@ -397,7 +334,6 @@ xfs_attr_set_iter(* same state (inode locked and joined, transaction * clean) no matter how we got to this step. */ - dac->flags |=XFS_DAC_DEFER_FINISH ;return -EAGAIN ;case 0 : dac->dela_state =XFS_DAS_FOUND_LBLK ;
@@ -454,32 +390,6 @@ xfs_has_attr(/* * Remove the attribute specified in @args. -*/ -int -xfs_attr_remove_args ( -struct xfs_da_args *args) -{ -int error =0 ; -struct xfs_delattr_context dac = { - .da_args = args, - }; - -do { - error =xfs_attr_remove_iter (&dac); -if (error != -EAGAIN ) -break ; - - error =xfs_attr_trans_roll (&dac); -if (error) -return error; - - }while (true); - -return error; -} - -/* -* Remove the attribute specified in @args. * * This function may return -EAGAIN to signal that the transaction needs to be * rolled. Callers should continue calling this function until they receive a
@@ -886,7 +796,6 @@ xfs_attr_leaf_addname(if (error)return error; - dac->flags |=XFS_DAC_DEFER_FINISH ;return -EAGAIN ; }
@@ -1183,7 +1092,6 @@ xfs_attr_node_addname(* Restart routine from the top. No need to set the * state */ - dac->flags |=XFS_DAC_DEFER_FINISH ;return -EAGAIN ; }
@@ -1196,7 +1104,6 @@ xfs_attr_node_addname( error =xfs_da3_split (state);if (error) goto out; - dac->flags |=XFS_DAC_DEFER_FINISH ; }else {/* * Addition succeeded, update Btree hashvals.
@@ -1237,7 +1144,6 @@ das_alloc_node:if (error)return error; - dac->flags |=XFS_DAC_DEFER_FINISH ; dac->dela_state =XFS_DAS_ALLOC_NODE ;return -EAGAIN ; }
@@ -1505,7 +1411,6 @@ xfs_attr_node_remove_step(if (retval && (state->path.active >1 )) { error =xfs_da3_join (state);if (error) - dac->flags |=XFS_DAC_DEFER_FINISH ; dac->dela_state =XFS_DAS_RM_SHRINK ;return -EAGAIN ; }
libxfs/xfs_attr.h +0 -2
@@ -297,11 +297,9 @@ int xfs_inode_hasattr(struct xfs_inode *ip);int xfs_attr_get_ilocked (struct xfs_da_args *args);int xfs_attr_get (struct xfs_da_args *args);int xfs_attr_set (struct xfs_da_args *args); -int xfs_attr_set_args (struct xfs_da_args *args);int xfs_attr_set_iter (struct xfs_delattr_context *dac,struct xfs_buf **leaf_bp);int xfs_has_attr (struct xfs_da_args *args); -int xfs_attr_remove_args (struct xfs_da_args *args);int xfs_attr_remove_iter (struct xfs_delattr_context *dac);bool xfs_attr_namecheck (const void *name,size_t length); void xfs_delattr_context_init(struct xfs_delattr_context *dac,
Signature · 1 line
2.7.4
PATCH v13 12/14 xfs_io: Add delayed attributes error tag
In reply to Allison HendersonFrom: Allison Collins <[email protected]>
This patch adds an error tag that we can use to test delayed attribute recovery and replay
--- io/inject.c | 1 + libxfs/xfs_errortag.h | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-)
io/inject.c +1 -0
@@ -55,6 +55,7 @@ error_tag(char *name) { XFS_ERRTAG_FORCE_SUMMARY_RECALC, "bad_summary" }, { XFS_ERRTAG_IUNLINK_FALLBACK, "iunlink_fallback" }, { XFS_ERRTAG_BUF_IOERROR, "buf_ioerror" }, + { XFS_ERRTAG_DELAYED_ATTR, "delayed_attr" }, { XFS_ERRTAG_MAX, NULL } };int count;
libxfs/xfs_errortag.h +3 -1
@@ -56,7 +56,8 @@#define XFS_ERRTAG_FORCE_SUMMARY_RECALC 33#define XFS_ERRTAG_IUNLINK_FALLBACK 34#define XFS_ERRTAG_BUF_IOERROR 35 -#define XFS_ERRTAG_MAX 36 +#define XFS_ERRTAG_DELAYED_ATTR 36 +#define XFS_ERRTAG_MAX 37/* * Random factors for above tags, 1 means always, 2 means 1/2 time, etc.
@@ -97,5 +98,6 @@#define XFS_RANDOM_FORCE_SUMMARY_RECALC 1#define XFS_RANDOM_IUNLINK_FALLBACK (XFS_RANDOM_DEFAULT/10)#define XFS_RANDOM_BUF_IOERROR XFS_RANDOM_DEFAULT +#define XFS_RANDOM_DELAYED_ATTR 1#endif /* __XFS_ERRORTAG_H_ */
Signature · 1 line
2.7.4
RFC PATCH v13 13/14 xfsprogs: Add log item printing for ATTRI and ATTRD
In reply to Allison HendersonThis patch implements a new set of log printing functions to print the ATTRI and ATTRD items and vectors in the log. These will be used during log dump and log recover operations.
RFC: Though most attributes are strings, the attribute operations accept any binary payload, so we cannot assume them printable. This was done intentionally in preparation for parent pointers. And until parent pointers get here, attributes have no discernible format. So the print routines are just a simple hex dump for now. It's not pretty, but works for now.
--- logprint/log_misc.c | 31 +++++++- logprint/log_print_all.c | 12 +++ logprint/log_redo.c | 197 +++++++++++++++++++++++++++++++++++++++++++++++ logprint/logprint.h | 10 +++ 4 files changed, 249 insertions(+), 1 deletion(-)
logprint/log_misc.c +30 -1
@@ -54,11 +54,29 @@ print_stars(void) "***********************************\n"); }/* print_stars */ +void +print_hex_dump (char *ptr,int len) { +int i =0 ; + +for (i =0 ; i < len; i++) { +if (i %16 ==0 ) +printf ("%08x " , i); + +printf ("%02x" , ptr[i]); + +if ((i+1 )%16 ==0 ) +printf ("\n" ); +else if ((i+1 )%2 ==0 ) +printf (" " ); + } +printf ("\n" ); +} +/* * Given a pointer to a data segment, print out the data as if it were * a log operation header. */ -static void +void xlog_print_op_header (xlog_op_header_t *op_head,int i,char **ptr)
@@ -949,6 +967,17 @@ xlog_print_record( be32_to_cpu(op_head->oh_len));break ; } +case XFS_LI_ATTRI : { + skip =xlog_print_trans_attri (&ptr, +be32_to_cpu (op_head->oh_len), + &i); +break ; + } +case XFS_LI_ATTRD : { + skip =xlog_print_trans_attrd (&ptr, +be32_to_cpu (op_head->oh_len)); +break ; + }case XFS_LI_RUI : { skip = xlog_print_trans_rui(&ptr, be32_to_cpu(op_head->oh_len),
logprint/log_print_all.c +12 -0
@@ -402,6 +402,12 @@ xlog_recover_print_logitem(case XFS_LI_EFI :xlog_recover_print_efi (item);break ; +case XFS_LI_ATTRD : +xlog_recover_print_attrd (item); +break ; +case XFS_LI_ATTRI : +xlog_recover_print_attri (item); +break ;case XFS_LI_RUD :xlog_recover_print_rud (item);break ;
@@ -454,6 +460,12 @@ xlog_recover_print_item(case XFS_LI_EFI :printf ("EFI" );break ; +case XFS_LI_ATTRD : +printf ("ATTRD" ); +break ; +case XFS_LI_ATTRI : +printf ("ATTRI" ); +break ;case XFS_LI_RUD :printf ("RUD" );break ;
logprint/log_redo.c +197 -0
206 lines not on this page · raw message
logprint/logprint.h +10 -0
@@ -28,6 +28,7 @@ extern void xfs_log_print_trans(struct xlog *, int);extern void print_xlog_record_line (void );extern void print_xlog_op_line (void );extern void print_stars (void ); +extern void print_hex_dump (char * ptr,int len);extern struct xfs_inode_log_format *xfs_inode_item_format_convert (char *,uint ,struct xfs_inode_log_format *);
@@ -52,4 +53,13 @@ extern void xlog_recover_print_bui(struct xlog_recover_item *item);extern int xlog_print_trans_bud (char **ptr,uint len);extern void xlog_recover_print_bud (struct xlog_recover_item *item); +#define MAX_ATTR_VAL_PRINT 128 + +extern int xlog_print_trans_attri (char **ptr,uint src_len,int *i); +extern int xlog_print_trans_attri_name (char **ptr,uint src_len); +extern int xlog_print_trans_attri_value (char **ptr,uint src_len,int value_len); +extern void xlog_recover_print_attri (struct xlog_recover_item *item); +extern int xlog_print_trans_attrd (char **ptr,uint len); +extern void xlog_recover_print_attrd (struct xlog_recover_item *item); +extern void xlog_print_op_header (xlog_op_header_t *op_head,int i,char **ptr);#endif /* LOGPRINT_H */
Signature · 1 line
2.7.4
Re: [PATCH v13 13/14] [RFC] xfsprogs: Add log item printing for ATTRI and ATTRD
Quoted 10 lines · Allison Henderson
This patch implements a new set of log printing functions to print the ATTRI and ATTRD items and vectors in the log. These will be used during log dump and log recover operations.
RFC: Though most attributes are strings, the attribute operations accept any binary payload, so we cannot assume them printable. This was done intentionally in preparation for parent pointers. And until parent pointers get here, attributes have no discernible format. So the print routines are just a simple hex dump for now. It's not pretty, but works for now.
Perhaps this should print the string if the entire buffer consists of printable characters?
Quoted 44 lines
Signed-off-by Allison Henderson <[email protected]>--- logprint/log_misc.c | 31 +++++++- logprint/log_print_all.c | 12 +++ logprint/log_redo.c | 197 +++++++++++++++++++++++++++++++++++++++++++++++ logprint/logprint.h | 10 +++ 4 files changed, 249 insertions(+), 1 deletion(-)logprint/log_misc.c +19
-1@@ -54,11 +54,29 @@ print_stars(void) "***********************************\n"); }/* print_stars */ +void +print_hex_dump (char *ptr,int len) { +int i =0 ; + +for (i =0 ; i < len; i++) { +if (i %16 ==0 ) +printf ("%08x " , i); + +printf ("%02x" , ptr[i]); + +if ((i+1 )%16 ==0 ) +printf ("\n" ); +else if ((i+1 )%2 ==0 ) +printf (" " ); + } +printf ("\n" ); +} +/* * Given a pointer to a data segment, print out the data as if it were * a log operation header. */ -static void +void xlog_print_op_header (xlog_op_header_t *op_head,int i,char **ptr)
logprint/log_misc.c xlog_print_record( · line 976
Quoted 10 lines
logprint/log_misc.c +7
-0@@ -949,6 +967,17 @@ xlog_print_record( be32_to_cpu(op_head->oh_len));break ; } +case XFS_LI_ATTRI : { + skip =xlog_print_trans_attri (&ptr, +be32_to_cpu (op_head->oh_len), + &i); +break ; + } +case XFS_LI_ATTRD : {
Inconsistent indenting.
Not that this function was a sparkling gem to begin with...
Quoted 87 lines
logprint/log_misc.c +4
-0+ skip =xlog_print_trans_attrd (&ptr, +be32_to_cpu (op_head->oh_len)); +break ; + }case XFS_LI_RUI : { skip = xlog_print_trans_rui(&ptr, be32_to_cpu(op_head->oh_len),logprint/log_print_all.c +12
-0@@ -402,6 +402,12 @@ xlog_recover_print_logitem(case XFS_LI_EFI :xlog_recover_print_efi (item);break ; +case XFS_LI_ATTRD : +xlog_recover_print_attrd (item); +break ; +case XFS_LI_ATTRI : +xlog_recover_print_attri (item); +break ;case XFS_LI_RUD :xlog_recover_print_rud (item);break ;@@ -454,6 +460,12 @@ xlog_recover_print_item(case XFS_LI_EFI :printf ("EFI" );break ; +case XFS_LI_ATTRD : +printf ("ATTRD" ); +break ; +case XFS_LI_ATTRI : +printf ("ATTRI" ); +break ;case XFS_LI_RUD :printf ("RUD" );break ;logprint/log_redo.c +35
-0@@ -8,6 +8,7 @@#include "libxlog.h" #include "logprint.h" +#include "xfs_attr_item.h" /* Extent Free Items */ @@ -653,3 +654,199 @@ xlog_recover_print_bud( f = item->ri_buf[0 ].i_addr;xlog_print_trans_bud (&f,sizeof (struct xfs_bud_log_format )); } + +/* Attr Items */ + +static int +xfs_attri_copy_log_format ( +char *buf, +uint len, +struct xfs_attri_log_format *dst_attri_fmt) +{ +uint dst_len =sizeof (struct xfs_attri_log_format ); + +if (len == dst_len) { +memcpy ((char *)dst_attri_fmt, buf, len); +return 0 ; + } + +fprintf (stderr,_ ("%s: bad size of attri format: %u; expected %u\n" ), + progname, len, dst_len); +return 1 ; +} + +int +xlog_print_trans_attri ( +char **ptr, +uint src_len, +int *i) +{ +struct xfs_attri_log_format *src_f =NULL ; +xlog_op_header_t *head =NULL ; +uint dst_len; +int error =0 ; + + dst_len =sizeof (struct xfs_attri_log_format ); +if (src_len != dst_len) {
logprint/log_redo.c xlog_recover_print_bud( · line 700
Quoted 10 lines
logprint/log_redo.c +10
-0+fprintf (stderr,_ ("%s: bad size of attri format: %u; expected %u\n" ), + progname, src_len, dst_len); +return 1 ; + } + +/* +* memmove to ensure 8-byte alignment for the long longs in +* xfs_attri_log_format_t structure +*/ +if ((src_f = (struct xfs_attri_log_format *)malloc (src_len)) ==NULL ) {
src_f = malloc(src_len);
if (!src_f) {Quoted 51 lines
logprint/log_redo.c +51
-0+fprintf (stderr,_ ("%s: xlog_print_trans_attri: malloc failed\n" ), + progname); +exit (1 ); + } +memmove ((char *)src_f, *ptr, src_len); + *ptr += src_len; + +printf (_ ("ATTRI: #regs: %d name_len: %d, value_len: %d id: 0x%llx\n" ), + src_f->alfi_size, src_f->alfi_name_len, src_f->alfi_value_len, + (unsigned long long )src_f->alfi_id); + +if (src_f->alfi_name_len >0 ) { +printf (_ ("\n" )); + (*i)++; + head = (xlog_op_header_t *)*ptr; +xlog_print_op_header (head, *i, ptr); + error =xlog_print_trans_attri_name (ptr,be32_to_cpu (head->oh_len)); +if (error) + goto error; + } + +if (src_f->alfi_value_len >0 ) { +printf (_ ("\n" )); + (*i)++; + head = (xlog_op_header_t *)*ptr; +xlog_print_op_header (head, *i, ptr); + error =xlog_print_trans_attri_value (ptr,be32_to_cpu (head->oh_len), + src_f->alfi_value_len); + } +error: +free (src_f); + +return error; +}/* xlog_print_trans_attri */ + +int +xlog_print_trans_attri_name ( +char **ptr, +uint src_len) +{ +printf (_ ("ATTRI: name len:%u\n" ), src_len); +print_hex_dump (*ptr, src_len); + + *ptr += src_len; + +return 0 ; +}/* xlog_print_trans_attri */ + +int +xlog_print_trans_attri_value( + char **ptr,
logprint/log_redo.c xlog_recover_print_bud( · line 761
Quoted 10 lines
logprint/log_redo.c +10
-0+uint src_len, + int value_len) +{ + int len = value_len; + +if (len >MAX_ATTR_VAL_PRINT ) + len =MAX_ATTR_VAL_PRINT ; + +printf (_ ("ATTRI: value len:%u\n" ), value_len); +print_hex_dump (*ptr, len);
print_hex_dump(*ptr, min(len, MAX_ATTR_VAL_PRINT)); ?
--D
Quoted 54 lines
logprint/log_redo.c +54
-0+ + *ptr += src_len; + +return 0 ; +}/* xlog_print_trans_attri_value */ + +void +xlog_recover_print_attri ( +struct xlog_recover_item *item) +{ +struct xfs_attri_log_format *f, *src_f =NULL ; +uint src_len, dst_len; + +int region =0 ; + + src_f = (struct xfs_attri_log_format *)item->ri_buf[0 ].i_addr; + src_len = item->ri_buf[region].i_len; + +/* +* An xfs_attri_log_format structure contains a attribute name and +* variable length value as the last field. +*/ + dst_len =sizeof (struct xfs_attri_log_format ); + +if ((f = ((struct xfs_attri_log_format *)malloc (dst_len))) ==NULL ) { +fprintf (stderr,_ ("%s: xlog_recover_print_attri: malloc failed\n" ), + progname); +exit (1 ); + } +if (xfs_attri_copy_log_format ((char *)src_f, src_len, f)) + goto out; + +printf (_ ("ATTRI: #regs: %d name_len: %d, value_len: %d id: 0x%llx\n" ), + f->alfi_size, f->alfi_name_len, f->alfi_value_len, (unsigned long long )f->alfi_id); + +if (f->alfi_name_len >0 ) { + region++; +printf (_ ("ATTRI: name len:%u\n" ), f->alfi_name_len); +print_hex_dump ((char *)item->ri_buf[region].i_addr, + f->alfi_name_len); + } + +if (f->alfi_value_len >0 ) { +int len = f->alfi_value_len; + +if (len >MAX_ATTR_VAL_PRINT ) + len =MAX_ATTR_VAL_PRINT ; + + region++; +printf (_ ("ATTRI: value len:%u\n" ), f->alfi_value_len); +print_hex_dump ((char *)item->ri_buf[region].i_addr, len); + } + +out:
logprint/log_redo.c xlog_recover_print_bud( · line 825
Quoted 10 lines
logprint/log_redo.c +10
-0+free (f); + +} + +int +xlog_print_trans_attrd (char **ptr,uint len) +{ +struct xfs_attrd_log_format *f; +struct xfs_attrd_log_format lbuf; +uint core_size =sizeof (struct xfs_attrd_log_format );
Indenting issues and whatnot...
Quoted 56 lines
logprint/log_redo.c +27
-0+ +memcpy (&lbuf, *ptr,MIN (core_size, len)); + f = &lbuf; + *ptr += len; +if (len >= core_size) { +printf (_ ("ATTRD: #regs: %d id: 0x%llx\n" ), + f->alfd_size, + (unsigned long long )f->alfd_alf_id); +return 0 ; + }else { +printf (_ ("ATTRD: Not enough data to decode further\n" )); +return 1 ; + } +}/* xlog_print_trans_attrd */ + +void +xlog_recover_print_attrd ( +struct xlog_recover_item *item) +{ +struct xfs_attrd_log_format *f; + + f = (struct xfs_attrd_log_format *)item->ri_buf[0 ].i_addr; + +printf (_ (" ATTRD: #regs: %d id: 0x%llx\n" ), + f->alfd_size, + (unsigned long long )f->alfd_alf_id); +}logprint/logprint.h +10
-0@@ -28,6 +28,7 @@ extern void xfs_log_print_trans(struct xlog *, int);extern void print_xlog_record_line (void );extern void print_xlog_op_line (void );extern void print_stars (void ); +extern void print_hex_dump (char * ptr,int len);extern struct xfs_inode_log_format *xfs_inode_item_format_convert (char *,uint ,struct xfs_inode_log_format *);@@ -52,4 +53,13 @@ extern void xlog_recover_print_bui(struct xlog_recover_item *item);extern int xlog_print_trans_bud (char **ptr,uint len);extern void xlog_recover_print_bud (struct xlog_recover_item *item); +#define MAX_ATTR_VAL_PRINT 128 + +extern int xlog_print_trans_attri (char **ptr,uint src_len,int *i); +extern int xlog_print_trans_attri_name (char **ptr,uint src_len); +extern int xlog_print_trans_attri_value (char **ptr,uint src_len,int value_len); +extern void xlog_recover_print_attri (struct xlog_recover_item *item); +extern int xlog_print_trans_attrd (char **ptr,uint len); +extern void xlog_recover_print_attrd (struct xlog_recover_item *item); +extern void xlog_print_op_header (xlog_op_header_t *op_head,int i,char **ptr);#endif /* LOGPRINT_H */ Signature · 1 line
2.7.4
Re: [PATCH v13 13/14] [RFC] xfsprogs: Add log item printing for ATTRI and ATTRD
Quoted 12 lines · Darrick J. Wong
Quoted 10 lines · Allison Henderson
This patch implements a new set of log printing functions to print the ATTRI and ATTRD items and vectors in the log. These will be used during log dump and log recover operations.
RFC: Though most attributes are strings, the attribute operations accept any binary payload, so we cannot assume them printable. This was done intentionally in preparation for parent pointers. And until parent pointers get here, attributes have no discernible format. So the print routines are just a simple hex dump for now. It's not pretty, but works for now.
Quoted 2 lines
Perhaps this should print the string if the entire buffer consists of printable characters?
I'm fine with that as long as everyone else is. Just thought I should point it out. :-)
Quoted 58 lines
Quoted 45 lines
Signed-off-by Allison Henderson <[email protected]>--- logprint/log_misc.c | 31 +++++++- logprint/log_print_all.c | 12 +++ logprint/log_redo.c | 197 +++++++++++++++++++++++++++++++++++++++++++++++ logprint/logprint.h | 10 +++ 4 files changed, 249 insertions(+), 1 deletion(-)logprint/log_misc.c +19
-1@@ -54,11 +54,29 @@ print_stars(void) "***********************************\n"); }/* print_stars */ +void +print_hex_dump (char *ptr,int len) { +int i =0 ; + +for (i =0 ; i < len; i++) { +if (i %16 ==0 ) +printf ("%08x " , i); + +printf ("%02x" , ptr[i]); + +if ((i+1 )%16 ==0 ) +printf ("\n" ); +else if ((i+1 )%2 ==0 ) +printf (" " ); + } +printf ("\n" ); +} +/* * Given a pointer to a data segment, print out the data as if it were * a log operation header. */ -static void +void xlog_print_op_header (xlog_op_header_t *op_head,int i,char **ptr)logprint/log_misc.c xlog_print_record( · line 976
Quoted 10 lines
logprint/log_misc.c +7
-0@@ -949,6 +967,17 @@ xlog_print_record( be32_to_cpu(op_head->oh_len));break ; } +case XFS_LI_ATTRI : { + skip =xlog_print_trans_attri (&ptr, +be32_to_cpu (op_head->oh_len), + &i); +break ; + } +case XFS_LI_ATTRD : {Inconsistent indenting.
Quoted 2 lines
Not that this function was a sparkling gem to begin with...
No worries, will fix, it's been a while since I've looked at this patch. :-)
Quoted 92 lines
Quoted 92 lines
logprint/log_misc.c +4
-0+ skip =xlog_print_trans_attrd (&ptr, +be32_to_cpu (op_head->oh_len)); +break ; + }case XFS_LI_RUI : { skip = xlog_print_trans_rui(&ptr, be32_to_cpu(op_head->oh_len),logprint/log_print_all.c +12
-0@@ -402,6 +402,12 @@ xlog_recover_print_logitem(case XFS_LI_EFI :xlog_recover_print_efi (item);break ; +case XFS_LI_ATTRD : +xlog_recover_print_attrd (item); +break ; +case XFS_LI_ATTRI : +xlog_recover_print_attri (item); +break ;case XFS_LI_RUD :xlog_recover_print_rud (item);break ;@@ -454,6 +460,12 @@ xlog_recover_print_item(case XFS_LI_EFI :printf ("EFI" );break ; +case XFS_LI_ATTRD : +printf ("ATTRD" ); +break ; +case XFS_LI_ATTRI : +printf ("ATTRI" ); +break ;case XFS_LI_RUD :printf ("RUD" );break ;logprint/log_redo.c +40
-0@@ -8,6 +8,7 @@#include "libxlog.h" #include "logprint.h" +#include "xfs_attr_item.h" /* Extent Free Items */ @@ -653,3 +654,199 @@ xlog_recover_print_bud( f = item->ri_buf[0 ].i_addr;xlog_print_trans_bud (&f,sizeof (struct xfs_bud_log_format )); } + +/* Attr Items */ + +static int +xfs_attri_copy_log_format ( +char *buf, +uint len, +struct xfs_attri_log_format *dst_attri_fmt) +{ +uint dst_len =sizeof (struct xfs_attri_log_format ); + +if (len == dst_len) { +memcpy ((char *)dst_attri_fmt, buf, len); +return 0 ; + } + +fprintf (stderr,_ ("%s: bad size of attri format: %u; expected %u\n" ), + progname, len, dst_len); +return 1 ; +} + +int +xlog_print_trans_attri ( +char **ptr, +uint src_len, +int *i) +{ +struct xfs_attri_log_format *src_f =NULL ; +xlog_op_header_t *head =NULL ; +uint dst_len; +int error =0 ; + + dst_len =sizeof (struct xfs_attri_log_format ); +if (src_len != dst_len) { +fprintf (stderr,_ ("%s: bad size of attri format: %u; expected %u\n" ), + progname, src_len, dst_len); +return 1 ; + } +
Quoted 9 lines
logprint/log_redo.c xlog_recover_print_bud( · line 700
Quoted 5 lines
logprint/log_redo.c +5
-0+/* +* memmove to ensure 8-byte alignment for the long longs in +* xfs_attri_log_format_t structure +*/ +if ((src_f = (struct xfs_attri_log_format *)malloc (src_len)) ==NULL ) {src_f = malloc(src_len); if (!src_f) {
Sure, will break up a bit
Quoted 55 lines
Quoted 55 lines
logprint/log_redo.c +55
-0+fprintf (stderr,_ ("%s: xlog_print_trans_attri: malloc failed\n" ), + progname); +exit (1 ); + } +memmove ((char *)src_f, *ptr, src_len); + *ptr += src_len; + +printf (_ ("ATTRI: #regs: %d name_len: %d, value_len: %d id: 0x%llx\n" ), + src_f->alfi_size, src_f->alfi_name_len, src_f->alfi_value_len, + (unsigned long long )src_f->alfi_id); + +if (src_f->alfi_name_len >0 ) { +printf (_ ("\n" )); + (*i)++; + head = (xlog_op_header_t *)*ptr; +xlog_print_op_header (head, *i, ptr); + error =xlog_print_trans_attri_name (ptr,be32_to_cpu (head->oh_len)); +if (error) + goto error; + } + +if (src_f->alfi_value_len >0 ) { +printf (_ ("\n" )); + (*i)++; + head = (xlog_op_header_t *)*ptr; +xlog_print_op_header (head, *i, ptr); + error =xlog_print_trans_attri_value (ptr,be32_to_cpu (head->oh_len), + src_f->alfi_value_len); + } +error: +free (src_f); + +return error; +}/* xlog_print_trans_attri */ + +int +xlog_print_trans_attri_name ( +char **ptr, +uint src_len) +{ +printf (_ ("ATTRI: name len:%u\n" ), src_len); +print_hex_dump (*ptr, src_len); + + *ptr += src_len; + +return 0 ; +}/* xlog_print_trans_attri */ + +int +xlog_print_trans_attri_value ( +char **ptr, +uint src_len, +int value_len) +{ +int len = value_len;
Quoted 8 lines
logprint/log_redo.c xlog_recover_print_bud( · line 761
Quoted 6 lines
logprint/log_redo.c +6
-0+ +if (len >MAX_ATTR_VAL_PRINT ) + len =MAX_ATTR_VAL_PRINT ; + +printf (_ ("ATTRI: value len:%u\n" ), value_len); +print_hex_dump (*ptr, len);
print_hex_dump(*ptr, min(len, MAX_ATTR_VAL_PRINT)); ?
Ok, will simplify.
Thanks!
Allison
Quoted 126 lines
--D
Quoted 54 lines
logprint/log_redo.c +54
-0+ + *ptr += src_len; + +return 0 ; +}/* xlog_print_trans_attri_value */ + +void +xlog_recover_print_attri ( +struct xlog_recover_item *item) +{ +struct xfs_attri_log_format *f, *src_f =NULL ; +uint src_len, dst_len; + +int region =0 ; + + src_f = (struct xfs_attri_log_format *)item->ri_buf[0 ].i_addr; + src_len = item->ri_buf[region].i_len; + +/* +* An xfs_attri_log_format structure contains a attribute name and +* variable length value as the last field. +*/ + dst_len =sizeof (struct xfs_attri_log_format ); + +if ((f = ((struct xfs_attri_log_format *)malloc (dst_len))) ==NULL ) { +fprintf (stderr,_ ("%s: xlog_recover_print_attri: malloc failed\n" ), + progname); +exit (1 ); + } +if (xfs_attri_copy_log_format ((char *)src_f, src_len, f)) + goto out; + +printf (_ ("ATTRI: #regs: %d name_len: %d, value_len: %d id: 0x%llx\n" ), + f->alfi_size, f->alfi_name_len, f->alfi_value_len, (unsigned long long )f->alfi_id); + +if (f->alfi_name_len >0 ) { + region++; +printf (_ ("ATTRI: name len:%u\n" ), f->alfi_name_len); +print_hex_dump ((char *)item->ri_buf[region].i_addr, + f->alfi_name_len); + } + +if (f->alfi_value_len >0 ) { +int len = f->alfi_value_len; + +if (len >MAX_ATTR_VAL_PRINT ) + len =MAX_ATTR_VAL_PRINT ; + + region++; +printf (_ ("ATTRI: value len:%u\n" ), f->alfi_value_len); +print_hex_dump ((char *)item->ri_buf[region].i_addr, len); + } + +out:logprint/log_redo.c xlog_recover_print_bud( · line 825
Quoted 10 lines
logprint/log_redo.c +10
-0+free (f); + +} + +int +xlog_print_trans_attrd (char **ptr,uint len) +{ +struct xfs_attrd_log_format *f; +struct xfs_attrd_log_format lbuf; +uint core_size =sizeof (struct xfs_attrd_log_format );Indenting issues and whatnot...
Quoted 56 lines
logprint/log_redo.c +27
-0+ +memcpy (&lbuf, *ptr,MIN (core_size, len)); + f = &lbuf; + *ptr += len; +if (len >= core_size) { +printf (_ ("ATTRD: #regs: %d id: 0x%llx\n" ), + f->alfd_size, + (unsigned long long )f->alfd_alf_id); +return 0 ; + }else { +printf (_ ("ATTRD: Not enough data to decode further\n" )); +return 1 ; + } +}/* xlog_print_trans_attrd */ + +void +xlog_recover_print_attrd ( +struct xlog_recover_item *item) +{ +struct xfs_attrd_log_format *f; + + f = (struct xfs_attrd_log_format *)item->ri_buf[0 ].i_addr; + +printf (_ (" ATTRD: #regs: %d id: 0x%llx\n" ), + f->alfd_size, + (unsigned long long )f->alfd_alf_id); +}logprint/logprint.h +10
-0@@ -28,6 +28,7 @@ extern void xfs_log_print_trans(struct xlog *, int);extern void print_xlog_record_line (void );extern void print_xlog_op_line (void );extern void print_stars (void ); +extern void print_hex_dump (char * ptr,int len);extern struct xfs_inode_log_format *xfs_inode_item_format_convert (char *,uint ,struct xfs_inode_log_format *);@@ -52,4 +53,13 @@ extern void xlog_recover_print_bui(struct xlog_recover_item *item);extern int xlog_print_trans_bud (char **ptr,uint len);extern void xlog_recover_print_bud (struct xlog_recover_item *item); +#define MAX_ATTR_VAL_PRINT 128 + +extern int xlog_print_trans_attri (char **ptr,uint src_len,int *i); +extern int xlog_print_trans_attri_name (char **ptr,uint src_len); +extern int xlog_print_trans_attri_value (char **ptr,uint src_len,int value_len); +extern void xlog_recover_print_attri (struct xlog_recover_item *item); +extern int xlog_print_trans_attrd (char **ptr,uint len); +extern void xlog_recover_print_attrd (struct xlog_recover_item *item); +extern void xlog_print_op_header (xlog_op_header_t *op_head,int i,char **ptr);#endif /* LOGPRINT_H */ Signature · 1 line
2.7.4
PATCH v13 14/14 xfsprogs: Add delayed attribute flag to cmd
In reply to Allison HendersonFrom: Allison Collins <[email protected]>
mkfs: enable feature bit in mkfs via the '-n delattr' parameter.
--- mkfs/xfs_mkfs.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
mkfs/xfs_mkfs.c +23 -1
@@ -94,6 +94,7 @@ enum {N_SIZE =0 ,N_VERSION ,N_FTYPE , +N_DELATTR , N_MAX_OPTS, };
@@ -547,6 +548,7 @@ static struct opt_params nopts = { [N_SIZE] = "size", [N_VERSION] = "version", [N_FTYPE] = "ftype", + [N_DELATTR ] ="delattr" , }, .subopt_params = { { .index =N_SIZE ,
@@ -569,6 +571,12 @@ static struct opt_params nopts = { .maxval = 1, .defaultval = 1, }, + { .index = N_DELATTR, + .conflicts = { { NULL, LAST_CONFLICT } }, + .minval = 0, + .maxval = 1, + .defaultval = 1, + }, }, };
@@ -742,6 +750,7 @@ struct sb_feat_args {bool reflink;/* XFS_SB_FEAT_RO_COMPAT_REFLINK */ bool nodalign;bool nortalign; +bool delattr;/* XFS_SB_FEAT_INCOMPAT_LOG_DELATTR */ };struct cli_params {
@@ -873,7 +882,7 @@ usage( void ) /* log subvol */ [-l agnum=n,internal,size=num,logdev=xxx,version=n\n\ sunit=value|su=num,sectsize=num,lazy-count=0|1]\n\ /* label */ [-L label (maximum 12 characters)]\n\ -/* naming */ [-n size=num,version=2|ci,ftype=0|1]\n\ +/* naming */ [-n size=num,version=2|ci,ftype=0|1,delattr=0|1]\n\ /* no-op info only */ [-N]\n\ /* prototype file */ [-p fname]\n\ /* quiet */ [-q]\n\
@@ -1592,6 +1601,9 @@ naming_opts_parser(case N_FTYPE : cli->sb_feat.dirftype =getnum (value, opts, subopt);break ; +case N_DELATTR : + cli->sb_feat.delattr =getnum (value, &nopts,N_DELATTR ); +break ;default :return -EINVAL ; }
@@ -1988,6 +2000,14 @@ _("reflink not supported without CRC support\n")); cli->sb_feat.reflink = false; } +if ((cli->sb_feat.delattr) && + cli->sb_feat.dir_version ==4 ) { +fprintf (stderr, +_ ("delayed attributes not supported on v4 filesystems\n" )); +usage (); + cli->sb_feat.delattr = false; + } +if ((cli->fsx.fsx_xflags &FS_XFLAG_COWEXTSIZE ) && !cli->sb_feat.reflink) { fprintf(stderr,
@@ -2953,6 +2973,8 @@ sb_set_features( sbp->sb_features_ro_compat |=XFS_SB_FEAT_RO_COMPAT_RMAPBT ;if (fp->reflink) sbp->sb_features_ro_compat |=XFS_SB_FEAT_RO_COMPAT_REFLINK ; +if (fp->delattr) + sbp->sb_features_log_incompat |=XFS_SB_FEAT_INCOMPAT_LOG_DELATTR ;/* * Sparse inode chunk support has two main inode alignment requirements.
Signature · 1 line
2.7.4
Re: [PATCH v13 14/14] xfsprogs: Add delayed attribute flag to cmd
Quoted 6 lines · Allison Henderson
From: Allison Collins <[email protected]>
mkfs: enable feature bit in mkfs via the '-n delattr' parameter.
Signed-off-by Allison Collins <[email protected]>Signed-off-by Allison Henderson <[email protected]>
I think it's sufficient to have one signoff here.
Quoted 65 lines
--- mkfs/xfs_mkfs.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)mkfs/xfs_mkfs.c +13
-1@@ -94,6 +94,7 @@ enum {N_SIZE =0 ,N_VERSION ,N_FTYPE , +N_DELATTR , N_MAX_OPTS, };@@ -547,6 +548,7 @@ static struct opt_params nopts = { [N_SIZE] = "size", [N_VERSION] = "version", [N_FTYPE] = "ftype", + [N_DELATTR ] ="delattr" , }, .subopt_params = { { .index =N_SIZE ,@@ -569,6 +571,12 @@ static struct opt_params nopts = { .maxval = 1, .defaultval = 1, }, + { .index = N_DELATTR, + .conflicts = { { NULL, LAST_CONFLICT } }, + .minval = 0, + .maxval = 1, + .defaultval = 1, + }, }, };@@ -742,6 +750,7 @@ struct sb_feat_args {bool reflink;/* XFS_SB_FEAT_RO_COMPAT_REFLINK */ bool nodalign;bool nortalign; +bool delattr;/* XFS_SB_FEAT_INCOMPAT_LOG_DELATTR */ };struct cli_params {@@ -873,7 +882,7 @@ usage( void ) /* log subvol */ [-l agnum=n,internal,size=num,logdev=xxx,version=n\n\ sunit=value|su=num,sectsize=num,lazy-count=0|1]\n\ /* label */ [-L label (maximum 12 characters)]\n\ -/* naming */ [-n size=num,version=2|ci,ftype=0|1]\n\ +/* naming */ [-n size=num,version=2|ci,ftype=0|1,delattr=0|1]\n\ /* no-op info only */ [-N]\n\ /* prototype file */ [-p fname]\n\ /* quiet */ [-q]\n\@@ -1592,6 +1601,9 @@ naming_opts_parser(case N_FTYPE : cli->sb_feat.dirftype =getnum (value, opts, subopt);break ; +case N_DELATTR : + cli->sb_feat.delattr =getnum (value, &nopts,N_DELATTR ); +break ;default :return -EINVAL ; }
mkfs/xfs_mkfs.c _("reflink not supported without CRC support\n")); · line 2006
Quoted 7 lines
mkfs/xfs_mkfs.c +4
-0@@ -1988,6 +2000,14 @@ _("reflink not supported without CRC support\n")); cli->sb_feat.reflink = false; } +if ((cli->sb_feat.delattr) && + cli->sb_feat.dir_version ==4 ) { +fprintf (stderr, +_ ("delayed attributes not supported on v4 filesystems\n" ));
I think this should move a few lines up to the big batch of code that turns off all the V5 features if crcs aren't enabled.
TBH this should silently turn off delattrs unless the admin explicitly enabled them, because one day this will be enabled by default.
--D
Quoted 19 lines
mkfs/xfs_mkfs.c +6
-0+usage (); + cli->sb_feat.delattr = false; + } +if ((cli->fsx.fsx_xflags &FS_XFLAG_COWEXTSIZE ) && !cli->sb_feat.reflink) { fprintf(stderr,@@ -2953,6 +2973,8 @@ sb_set_features( sbp->sb_features_ro_compat |=XFS_SB_FEAT_RO_COMPAT_RMAPBT ;if (fp->reflink) sbp->sb_features_ro_compat |=XFS_SB_FEAT_RO_COMPAT_REFLINK ; +if (fp->delattr) + sbp->sb_features_log_incompat |=XFS_SB_FEAT_INCOMPAT_LOG_DELATTR ;/* * Sparse inode chunk support has two main inode alignment requirements. Signature · 1 line
2.7.4
Re: [PATCH v13 14/14] xfsprogs: Add delayed attribute flag to cmd
Quoted 9 lines · Darrick J. Wong
Quoted 6 lines · Allison Henderson
From: Allison Collins <[email protected]>
mkfs: enable feature bit in mkfs via the '-n delattr' parameter.
Signed-off-by Allison Collins <[email protected]>Signed-off-by Allison Henderson <[email protected]>I think it's sufficient to have one signoff here.
Sorry, still cleaning those out
Quoted 77 lines
Quoted 66 lines
--- mkfs/xfs_mkfs.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)mkfs/xfs_mkfs.c +13
-1@@ -94,6 +94,7 @@ enum {N_SIZE =0 ,N_VERSION ,N_FTYPE , +N_DELATTR , N_MAX_OPTS, };@@ -547,6 +548,7 @@ static struct opt_params nopts = { [N_SIZE] = "size", [N_VERSION] = "version", [N_FTYPE] = "ftype", + [N_DELATTR ] ="delattr" , }, .subopt_params = { { .index =N_SIZE ,@@ -569,6 +571,12 @@ static struct opt_params nopts = { .maxval = 1, .defaultval = 1, }, + { .index = N_DELATTR, + .conflicts = { { NULL, LAST_CONFLICT } }, + .minval = 0, + .maxval = 1, + .defaultval = 1, + }, }, };@@ -742,6 +750,7 @@ struct sb_feat_args {bool reflink;/* XFS_SB_FEAT_RO_COMPAT_REFLINK */ bool nodalign;bool nortalign; +bool delattr;/* XFS_SB_FEAT_INCOMPAT_LOG_DELATTR */ };struct cli_params {@@ -873,7 +882,7 @@ usage( void ) /* log subvol */ [-l agnum=n,internal,size=num,logdev=xxx,version=n\n\ sunit=value|su=num,sectsize=num,lazy-count=0|1]\n\ /* label */ [-L label (maximum 12 characters)]\n\ -/* naming */ [-n size=num,version=2|ci,ftype=0|1]\n\ +/* naming */ [-n size=num,version=2|ci,ftype=0|1,delattr=0|1]\n\ /* no-op info only */ [-N]\n\ /* prototype file */ [-p fname]\n\ /* quiet */ [-q]\n\@@ -1592,6 +1601,9 @@ naming_opts_parser(case N_FTYPE : cli->sb_feat.dirftype =getnum (value, opts, subopt);break ; +case N_DELATTR : + cli->sb_feat.delattr =getnum (value, &nopts,N_DELATTR ); +break ;default :return -EINVAL ; }mkfs/xfs_mkfs.c _("reflink not supported without CRC support\n")); · line 2006
Quoted 7 lines
mkfs/xfs_mkfs.c +4
-0@@ -1988,6 +2000,14 @@ _("reflink not supported without CRC support\n")); cli->sb_feat.reflink = false; } +if ((cli->sb_feat.delattr) && + cli->sb_feat.dir_version ==4 ) { +fprintf (stderr, +_ ("delayed attributes not supported on v4 filesystems\n" ));I think this should move a few lines up to the big batch of code that turns off all the V5 features if crcs aren't enabled.
Quoted 2 lines
TBH this should silently turn off delattrs unless the admin explicitly enabled them, because one day this will be enabled by default.
Ok, I see it. Will do.
Quoted 22 lines
--D
Quoted 19 lines
mkfs/xfs_mkfs.c +6
-0+usage (); + cli->sb_feat.delattr = false; + } +if ((cli->fsx.fsx_xflags &FS_XFLAG_COWEXTSIZE ) && !cli->sb_feat.reflink) { fprintf(stderr,@@ -2953,6 +2973,8 @@ sb_set_features( sbp->sb_features_ro_compat |=XFS_SB_FEAT_RO_COMPAT_RMAPBT ;if (fp->reflink) sbp->sb_features_ro_compat |=XFS_SB_FEAT_RO_COMPAT_REFLINK ; +if (fp->delattr) + sbp->sb_features_log_incompat |=XFS_SB_FEAT_INCOMPAT_LOG_DELATTR ;/* * Sparse inode chunk support has two main inode alignment requirements. Signature · 1 line
2.7.4