| Message ID | 20191107012801.22863-15-allison.henderson@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | xfs: Delay Ready Attributes | expand |
On Wed, Nov 06, 2019 at 06:27:58PM -0700, Allison Collins wrote: > This patch adds a new struct xfs_delay_context, which we > will use to keep track of the current state of a delayed > attribute operation. > > The new 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. > > Signed-off-by: Allison Collins <allison.henderson@oracle.com> > --- > fs/xfs/libxfs/xfs_da_btree.h | 28 ++++++++++++++++++++++++++++ > fs/xfs/scrub/common.c | 2 ++ > fs/xfs/xfs_acl.c | 2 ++ > fs/xfs/xfs_attr_list.c | 1 + > fs/xfs/xfs_ioctl.c | 2 ++ > fs/xfs/xfs_ioctl32.c | 2 ++ > fs/xfs/xfs_iops.c | 2 ++ > fs/xfs/xfs_xattr.c | 1 + > 8 files changed, 40 insertions(+) > > diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h > index bed4f40..ef23ed8 100644 > --- a/fs/xfs/libxfs/xfs_da_btree.h > +++ b/fs/xfs/libxfs/xfs_da_btree.h > @@ -42,6 +42,33 @@ enum xfs_dacmp { > XFS_CMP_CASE /* names are same but differ in case */ > }; > > +enum xfs_attr_state { enum xfs_dc_state ? Hm, "dc" seems a little short. enum xfs_delattr_state? > + XFS_DC_INIT = 1, /* Init delay info */ > + XFS_DC_SF_TO_LEAF = 2, /* Converted short form to leaf */ > + XFS_DC_FOUND_LBLK = 3, /* We found leaf blk for attr */ > + XFS_DC_LEAF_TO_NODE = 4, /* Converted leaf to node */ > + XFS_DC_FOUND_NBLK = 5, /* We found node blk for attr */ > + XFS_DC_ALLOC_LEAF = 6, /* We are allocating leaf blocks */ > + XFS_DC_ALLOC_NODE = 7, /* We are allocating node blocks */ > + XFS_DC_RM_INVALIDATE = 8, /* We are invalidating blocks */ > + XFS_DC_RM_SHRINK = 9, /* We are shrinking the tree */ > + XFS_DC_RM_NODE_BLKS = 10,/* We are removing node blocks */ > +}; > + > +/* > + * Context used for keeping track of delayed attribute operations > + */ > +struct xfs_delay_context { struct xfs_delattr_context ? > + enum xfs_attr_state dc_state; > + struct xfs_buf *leaf_bp; > + struct xfs_bmbt_irec map; > + xfs_dablk_t lblkno; > + xfs_fileoff_t lfileoff; > + int blkcnt; > + struct xfs_da_state *da_state; > + struct xfs_da_state_blk *blk; > +}; Would be kinda nice to keep this structure size to a minimum by reordering these in order of decreasing size. pahole is your friend for doing that (or shouting me down). ;) But otherwise this seems ok. --D > + > /* > * Structure to ease passing around component names. > */ > @@ -69,6 +96,7 @@ typedef struct xfs_da_args { > int rmtvaluelen2; /* remote attr value length in bytes */ > int op_flags; /* operation flags */ > enum xfs_dacmp cmpresult; /* name compare result for lookups */ > + struct xfs_delay_context dc; /* context used for delay attr ops */ > } xfs_da_args_t; > > /* > diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c > index 1887605..9a649d1 100644 > --- a/fs/xfs/scrub/common.c > +++ b/fs/xfs/scrub/common.c > @@ -24,6 +24,8 @@ > #include "xfs_rmap_btree.h" > #include "xfs_log.h" > #include "xfs_trans_priv.h" > +#include "xfs_da_format.h" > +#include "xfs_da_btree.h" > #include "xfs_attr.h" > #include "xfs_reflink.h" > #include "scrub/scrub.h" > diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c > index e868755..1336477 100644 > --- a/fs/xfs/xfs_acl.c > +++ b/fs/xfs/xfs_acl.c > @@ -10,6 +10,8 @@ > #include "xfs_trans_resv.h" > #include "xfs_mount.h" > #include "xfs_inode.h" > +#include "xfs_da_format.h" > +#include "xfs_da_btree.h" > #include "xfs_attr.h" > #include "xfs_trace.h" > #include <linux/posix_acl_xattr.h> > diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c > index fab416c..e395864 100644 > --- a/fs/xfs/xfs_attr_list.c > +++ b/fs/xfs/xfs_attr_list.c > @@ -12,6 +12,7 @@ > #include "xfs_trans_resv.h" > #include "xfs_mount.h" > #include "xfs_da_format.h" > +#include "xfs_da_btree.h" > #include "xfs_inode.h" > #include "xfs_trans.h" > #include "xfs_bmap.h" > diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c > index ae0ed88..23b0ca6 100644 > --- a/fs/xfs/xfs_ioctl.c > +++ b/fs/xfs/xfs_ioctl.c > @@ -15,6 +15,8 @@ > #include "xfs_iwalk.h" > #include "xfs_itable.h" > #include "xfs_error.h" > +#include "xfs_da_format.h" > +#include "xfs_da_btree.h" > #include "xfs_attr.h" > #include "xfs_bmap.h" > #include "xfs_bmap_util.h" > diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c > index 3c0d518..e3278ac 100644 > --- a/fs/xfs/xfs_ioctl32.c > +++ b/fs/xfs/xfs_ioctl32.c > @@ -17,6 +17,8 @@ > #include "xfs_itable.h" > #include "xfs_fsops.h" > #include "xfs_rtalloc.h" > +#include "xfs_da_format.h" > +#include "xfs_da_btree.h" > #include "xfs_attr.h" > #include "xfs_ioctl.h" > #include "xfs_ioctl32.h" > diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c > index aef346e..68b9cd0 100644 > --- a/fs/xfs/xfs_iops.c > +++ b/fs/xfs/xfs_iops.c > @@ -13,6 +13,8 @@ > #include "xfs_inode.h" > #include "xfs_acl.h" > #include "xfs_quota.h" > +#include "xfs_da_format.h" > +#include "xfs_da_btree.h" > #include "xfs_attr.h" > #include "xfs_trans.h" > #include "xfs_trace.h" > diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c > index 6c5321d..0f0ebab 100644 > --- a/fs/xfs/xfs_xattr.c > +++ b/fs/xfs/xfs_xattr.c > @@ -10,6 +10,7 @@ > #include "xfs_log_format.h" > #include "xfs_da_format.h" > #include "xfs_inode.h" > +#include "xfs_da_btree.h" > #include "xfs_attr.h" > > #include <linux/posix_acl_xattr.h> > -- > 2.7.4 >
On 11/8/19 2:22 PM, Darrick J. Wong wrote: > On Wed, Nov 06, 2019 at 06:27:58PM -0700, Allison Collins wrote: >> This patch adds a new struct xfs_delay_context, which we >> will use to keep track of the current state of a delayed >> attribute operation. >> >> The new 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. >> >> Signed-off-by: Allison Collins <allison.henderson@oracle.com> >> --- >> fs/xfs/libxfs/xfs_da_btree.h | 28 ++++++++++++++++++++++++++++ >> fs/xfs/scrub/common.c | 2 ++ >> fs/xfs/xfs_acl.c | 2 ++ >> fs/xfs/xfs_attr_list.c | 1 + >> fs/xfs/xfs_ioctl.c | 2 ++ >> fs/xfs/xfs_ioctl32.c | 2 ++ >> fs/xfs/xfs_iops.c | 2 ++ >> fs/xfs/xfs_xattr.c | 1 + >> 8 files changed, 40 insertions(+) >> >> diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h >> index bed4f40..ef23ed8 100644 >> --- a/fs/xfs/libxfs/xfs_da_btree.h >> +++ b/fs/xfs/libxfs/xfs_da_btree.h >> @@ -42,6 +42,33 @@ enum xfs_dacmp { >> XFS_CMP_CASE /* names are same but differ in case */ >> }; >> >> +enum xfs_attr_state { > > enum xfs_dc_state ? > > Hm, "dc" seems a little short. > > enum xfs_delattr_state? > Sure. Maybe instead of XFS_DC_* we could do XFS_DAS_*? >> + XFS_DC_INIT = 1, /* Init delay info */ >> + XFS_DC_SF_TO_LEAF = 2, /* Converted short form to leaf */ >> + XFS_DC_FOUND_LBLK = 3, /* We found leaf blk for attr */ >> + XFS_DC_LEAF_TO_NODE = 4, /* Converted leaf to node */ >> + XFS_DC_FOUND_NBLK = 5, /* We found node blk for attr */ >> + XFS_DC_ALLOC_LEAF = 6, /* We are allocating leaf blocks */ >> + XFS_DC_ALLOC_NODE = 7, /* We are allocating node blocks */ >> + XFS_DC_RM_INVALIDATE = 8, /* We are invalidating blocks */ >> + XFS_DC_RM_SHRINK = 9, /* We are shrinking the tree */ >> + XFS_DC_RM_NODE_BLKS = 10,/* We are removing node blocks */ >> +}; >> + >> +/* >> + * Context used for keeping track of delayed attribute operations >> + */ >> +struct xfs_delay_context { > > struct xfs_delattr_context ? Sure, I'm not too particular on the names. > >> + enum xfs_attr_state dc_state; >> + struct xfs_buf *leaf_bp; >> + struct xfs_bmbt_irec map; >> + xfs_dablk_t lblkno; >> + xfs_fileoff_t lfileoff; >> + int blkcnt; >> + struct xfs_da_state *da_state; >> + struct xfs_da_state_blk *blk; >> +}; > > Would be kinda nice to keep this structure size to a minimum by > reordering these in order of decreasing size. pahole is your friend for > doing that (or shouting me down). ;) > Ok, I'll check that. Thanks for the review! Allison > But otherwise this seems ok. > > --D > >> + >> /* >> * Structure to ease passing around component names. >> */ >> @@ -69,6 +96,7 @@ typedef struct xfs_da_args { >> int rmtvaluelen2; /* remote attr value length in bytes */ >> int op_flags; /* operation flags */ >> enum xfs_dacmp cmpresult; /* name compare result for lookups */ >> + struct xfs_delay_context dc; /* context used for delay attr ops */ >> } xfs_da_args_t; >> >> /* >> diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c >> index 1887605..9a649d1 100644 >> --- a/fs/xfs/scrub/common.c >> +++ b/fs/xfs/scrub/common.c >> @@ -24,6 +24,8 @@ >> #include "xfs_rmap_btree.h" >> #include "xfs_log.h" >> #include "xfs_trans_priv.h" >> +#include "xfs_da_format.h" >> +#include "xfs_da_btree.h" >> #include "xfs_attr.h" >> #include "xfs_reflink.h" >> #include "scrub/scrub.h" >> diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c >> index e868755..1336477 100644 >> --- a/fs/xfs/xfs_acl.c >> +++ b/fs/xfs/xfs_acl.c >> @@ -10,6 +10,8 @@ >> #include "xfs_trans_resv.h" >> #include "xfs_mount.h" >> #include "xfs_inode.h" >> +#include "xfs_da_format.h" >> +#include "xfs_da_btree.h" >> #include "xfs_attr.h" >> #include "xfs_trace.h" >> #include <linux/posix_acl_xattr.h> >> diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c >> index fab416c..e395864 100644 >> --- a/fs/xfs/xfs_attr_list.c >> +++ b/fs/xfs/xfs_attr_list.c >> @@ -12,6 +12,7 @@ >> #include "xfs_trans_resv.h" >> #include "xfs_mount.h" >> #include "xfs_da_format.h" >> +#include "xfs_da_btree.h" >> #include "xfs_inode.h" >> #include "xfs_trans.h" >> #include "xfs_bmap.h" >> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c >> index ae0ed88..23b0ca6 100644 >> --- a/fs/xfs/xfs_ioctl.c >> +++ b/fs/xfs/xfs_ioctl.c >> @@ -15,6 +15,8 @@ >> #include "xfs_iwalk.h" >> #include "xfs_itable.h" >> #include "xfs_error.h" >> +#include "xfs_da_format.h" >> +#include "xfs_da_btree.h" >> #include "xfs_attr.h" >> #include "xfs_bmap.h" >> #include "xfs_bmap_util.h" >> diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c >> index 3c0d518..e3278ac 100644 >> --- a/fs/xfs/xfs_ioctl32.c >> +++ b/fs/xfs/xfs_ioctl32.c >> @@ -17,6 +17,8 @@ >> #include "xfs_itable.h" >> #include "xfs_fsops.h" >> #include "xfs_rtalloc.h" >> +#include "xfs_da_format.h" >> +#include "xfs_da_btree.h" >> #include "xfs_attr.h" >> #include "xfs_ioctl.h" >> #include "xfs_ioctl32.h" >> diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c >> index aef346e..68b9cd0 100644 >> --- a/fs/xfs/xfs_iops.c >> +++ b/fs/xfs/xfs_iops.c >> @@ -13,6 +13,8 @@ >> #include "xfs_inode.h" >> #include "xfs_acl.h" >> #include "xfs_quota.h" >> +#include "xfs_da_format.h" >> +#include "xfs_da_btree.h" >> #include "xfs_attr.h" >> #include "xfs_trans.h" >> #include "xfs_trace.h" >> diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c >> index 6c5321d..0f0ebab 100644 >> --- a/fs/xfs/xfs_xattr.c >> +++ b/fs/xfs/xfs_xattr.c >> @@ -10,6 +10,7 @@ >> #include "xfs_log_format.h" >> #include "xfs_da_format.h" >> #include "xfs_inode.h" >> +#include "xfs_da_btree.h" >> #include "xfs_attr.h" >> >> #include <linux/posix_acl_xattr.h> >> -- >> 2.7.4 >>
On Wed, Nov 06, 2019 at 06:27:58PM -0700, Allison Collins wrote: > This patch adds a new struct xfs_delay_context, which we > will use to keep track of the current state of a delayed > attribute operation. > Technically, this should track delayed or non-delayed attr operations, right? IIRC, the goal is that the difference between the two is that the former is driven by the dfops mechanism while the latter executes the same code with a higher level hack to roll transactions and loop through the state machine... Brian > The new 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. > > Signed-off-by: Allison Collins <allison.henderson@oracle.com> > --- > fs/xfs/libxfs/xfs_da_btree.h | 28 ++++++++++++++++++++++++++++ > fs/xfs/scrub/common.c | 2 ++ > fs/xfs/xfs_acl.c | 2 ++ > fs/xfs/xfs_attr_list.c | 1 + > fs/xfs/xfs_ioctl.c | 2 ++ > fs/xfs/xfs_ioctl32.c | 2 ++ > fs/xfs/xfs_iops.c | 2 ++ > fs/xfs/xfs_xattr.c | 1 + > 8 files changed, 40 insertions(+) > > diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h > index bed4f40..ef23ed8 100644 > --- a/fs/xfs/libxfs/xfs_da_btree.h > +++ b/fs/xfs/libxfs/xfs_da_btree.h > @@ -42,6 +42,33 @@ enum xfs_dacmp { > XFS_CMP_CASE /* names are same but differ in case */ > }; > > +enum xfs_attr_state { > + XFS_DC_INIT = 1, /* Init delay info */ > + XFS_DC_SF_TO_LEAF = 2, /* Converted short form to leaf */ > + XFS_DC_FOUND_LBLK = 3, /* We found leaf blk for attr */ > + XFS_DC_LEAF_TO_NODE = 4, /* Converted leaf to node */ > + XFS_DC_FOUND_NBLK = 5, /* We found node blk for attr */ > + XFS_DC_ALLOC_LEAF = 6, /* We are allocating leaf blocks */ > + XFS_DC_ALLOC_NODE = 7, /* We are allocating node blocks */ > + XFS_DC_RM_INVALIDATE = 8, /* We are invalidating blocks */ > + XFS_DC_RM_SHRINK = 9, /* We are shrinking the tree */ > + XFS_DC_RM_NODE_BLKS = 10,/* We are removing node blocks */ > +}; > + > +/* > + * Context used for keeping track of delayed attribute operations > + */ > +struct xfs_delay_context { > + enum xfs_attr_state dc_state; > + struct xfs_buf *leaf_bp; > + struct xfs_bmbt_irec map; > + xfs_dablk_t lblkno; > + xfs_fileoff_t lfileoff; > + int blkcnt; > + struct xfs_da_state *da_state; > + struct xfs_da_state_blk *blk; > +}; > + > /* > * Structure to ease passing around component names. > */ > @@ -69,6 +96,7 @@ typedef struct xfs_da_args { > int rmtvaluelen2; /* remote attr value length in bytes */ > int op_flags; /* operation flags */ > enum xfs_dacmp cmpresult; /* name compare result for lookups */ > + struct xfs_delay_context dc; /* context used for delay attr ops */ > } xfs_da_args_t; > > /* > diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c > index 1887605..9a649d1 100644 > --- a/fs/xfs/scrub/common.c > +++ b/fs/xfs/scrub/common.c > @@ -24,6 +24,8 @@ > #include "xfs_rmap_btree.h" > #include "xfs_log.h" > #include "xfs_trans_priv.h" > +#include "xfs_da_format.h" > +#include "xfs_da_btree.h" > #include "xfs_attr.h" > #include "xfs_reflink.h" > #include "scrub/scrub.h" > diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c > index e868755..1336477 100644 > --- a/fs/xfs/xfs_acl.c > +++ b/fs/xfs/xfs_acl.c > @@ -10,6 +10,8 @@ > #include "xfs_trans_resv.h" > #include "xfs_mount.h" > #include "xfs_inode.h" > +#include "xfs_da_format.h" > +#include "xfs_da_btree.h" > #include "xfs_attr.h" > #include "xfs_trace.h" > #include <linux/posix_acl_xattr.h> > diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c > index fab416c..e395864 100644 > --- a/fs/xfs/xfs_attr_list.c > +++ b/fs/xfs/xfs_attr_list.c > @@ -12,6 +12,7 @@ > #include "xfs_trans_resv.h" > #include "xfs_mount.h" > #include "xfs_da_format.h" > +#include "xfs_da_btree.h" > #include "xfs_inode.h" > #include "xfs_trans.h" > #include "xfs_bmap.h" > diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c > index ae0ed88..23b0ca6 100644 > --- a/fs/xfs/xfs_ioctl.c > +++ b/fs/xfs/xfs_ioctl.c > @@ -15,6 +15,8 @@ > #include "xfs_iwalk.h" > #include "xfs_itable.h" > #include "xfs_error.h" > +#include "xfs_da_format.h" > +#include "xfs_da_btree.h" > #include "xfs_attr.h" > #include "xfs_bmap.h" > #include "xfs_bmap_util.h" > diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c > index 3c0d518..e3278ac 100644 > --- a/fs/xfs/xfs_ioctl32.c > +++ b/fs/xfs/xfs_ioctl32.c > @@ -17,6 +17,8 @@ > #include "xfs_itable.h" > #include "xfs_fsops.h" > #include "xfs_rtalloc.h" > +#include "xfs_da_format.h" > +#include "xfs_da_btree.h" > #include "xfs_attr.h" > #include "xfs_ioctl.h" > #include "xfs_ioctl32.h" > diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c > index aef346e..68b9cd0 100644 > --- a/fs/xfs/xfs_iops.c > +++ b/fs/xfs/xfs_iops.c > @@ -13,6 +13,8 @@ > #include "xfs_inode.h" > #include "xfs_acl.h" > #include "xfs_quota.h" > +#include "xfs_da_format.h" > +#include "xfs_da_btree.h" > #include "xfs_attr.h" > #include "xfs_trans.h" > #include "xfs_trace.h" > diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c > index 6c5321d..0f0ebab 100644 > --- a/fs/xfs/xfs_xattr.c > +++ b/fs/xfs/xfs_xattr.c > @@ -10,6 +10,7 @@ > #include "xfs_log_format.h" > #include "xfs_da_format.h" > #include "xfs_inode.h" > +#include "xfs_da_btree.h" > #include "xfs_attr.h" > > #include <linux/posix_acl_xattr.h> > -- > 2.7.4 >
On 11/11/19 11:23 AM, Brian Foster wrote: > On Wed, Nov 06, 2019 at 06:27:58PM -0700, Allison Collins wrote: >> This patch adds a new struct xfs_delay_context, which we >> will use to keep track of the current state of a delayed >> attribute operation. >> > > Technically, this should track delayed or non-delayed attr operations, > right? IIRC, the goal is that the difference between the two is that the > former is driven by the dfops mechanism while the latter executes the > same code with a higher level hack to roll transactions and loop through > the state machine... > > Brian Yep, I will update the commit message. Thanks! Allison > >> The new 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. >> >> Signed-off-by: Allison Collins <allison.henderson@oracle.com> >> --- >> fs/xfs/libxfs/xfs_da_btree.h | 28 ++++++++++++++++++++++++++++ >> fs/xfs/scrub/common.c | 2 ++ >> fs/xfs/xfs_acl.c | 2 ++ >> fs/xfs/xfs_attr_list.c | 1 + >> fs/xfs/xfs_ioctl.c | 2 ++ >> fs/xfs/xfs_ioctl32.c | 2 ++ >> fs/xfs/xfs_iops.c | 2 ++ >> fs/xfs/xfs_xattr.c | 1 + >> 8 files changed, 40 insertions(+) >> >> diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h >> index bed4f40..ef23ed8 100644 >> --- a/fs/xfs/libxfs/xfs_da_btree.h >> +++ b/fs/xfs/libxfs/xfs_da_btree.h >> @@ -42,6 +42,33 @@ enum xfs_dacmp { >> XFS_CMP_CASE /* names are same but differ in case */ >> }; >> >> +enum xfs_attr_state { >> + XFS_DC_INIT = 1, /* Init delay info */ >> + XFS_DC_SF_TO_LEAF = 2, /* Converted short form to leaf */ >> + XFS_DC_FOUND_LBLK = 3, /* We found leaf blk for attr */ >> + XFS_DC_LEAF_TO_NODE = 4, /* Converted leaf to node */ >> + XFS_DC_FOUND_NBLK = 5, /* We found node blk for attr */ >> + XFS_DC_ALLOC_LEAF = 6, /* We are allocating leaf blocks */ >> + XFS_DC_ALLOC_NODE = 7, /* We are allocating node blocks */ >> + XFS_DC_RM_INVALIDATE = 8, /* We are invalidating blocks */ >> + XFS_DC_RM_SHRINK = 9, /* We are shrinking the tree */ >> + XFS_DC_RM_NODE_BLKS = 10,/* We are removing node blocks */ >> +}; >> + >> +/* >> + * Context used for keeping track of delayed attribute operations >> + */ >> +struct xfs_delay_context { >> + enum xfs_attr_state dc_state; >> + struct xfs_buf *leaf_bp; >> + struct xfs_bmbt_irec map; >> + xfs_dablk_t lblkno; >> + xfs_fileoff_t lfileoff; >> + int blkcnt; >> + struct xfs_da_state *da_state; >> + struct xfs_da_state_blk *blk; >> +}; >> + >> /* >> * Structure to ease passing around component names. >> */ >> @@ -69,6 +96,7 @@ typedef struct xfs_da_args { >> int rmtvaluelen2; /* remote attr value length in bytes */ >> int op_flags; /* operation flags */ >> enum xfs_dacmp cmpresult; /* name compare result for lookups */ >> + struct xfs_delay_context dc; /* context used for delay attr ops */ >> } xfs_da_args_t; >> >> /* >> diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c >> index 1887605..9a649d1 100644 >> --- a/fs/xfs/scrub/common.c >> +++ b/fs/xfs/scrub/common.c >> @@ -24,6 +24,8 @@ >> #include "xfs_rmap_btree.h" >> #include "xfs_log.h" >> #include "xfs_trans_priv.h" >> +#include "xfs_da_format.h" >> +#include "xfs_da_btree.h" >> #include "xfs_attr.h" >> #include "xfs_reflink.h" >> #include "scrub/scrub.h" >> diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c >> index e868755..1336477 100644 >> --- a/fs/xfs/xfs_acl.c >> +++ b/fs/xfs/xfs_acl.c >> @@ -10,6 +10,8 @@ >> #include "xfs_trans_resv.h" >> #include "xfs_mount.h" >> #include "xfs_inode.h" >> +#include "xfs_da_format.h" >> +#include "xfs_da_btree.h" >> #include "xfs_attr.h" >> #include "xfs_trace.h" >> #include <linux/posix_acl_xattr.h> >> diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c >> index fab416c..e395864 100644 >> --- a/fs/xfs/xfs_attr_list.c >> +++ b/fs/xfs/xfs_attr_list.c >> @@ -12,6 +12,7 @@ >> #include "xfs_trans_resv.h" >> #include "xfs_mount.h" >> #include "xfs_da_format.h" >> +#include "xfs_da_btree.h" >> #include "xfs_inode.h" >> #include "xfs_trans.h" >> #include "xfs_bmap.h" >> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c >> index ae0ed88..23b0ca6 100644 >> --- a/fs/xfs/xfs_ioctl.c >> +++ b/fs/xfs/xfs_ioctl.c >> @@ -15,6 +15,8 @@ >> #include "xfs_iwalk.h" >> #include "xfs_itable.h" >> #include "xfs_error.h" >> +#include "xfs_da_format.h" >> +#include "xfs_da_btree.h" >> #include "xfs_attr.h" >> #include "xfs_bmap.h" >> #include "xfs_bmap_util.h" >> diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c >> index 3c0d518..e3278ac 100644 >> --- a/fs/xfs/xfs_ioctl32.c >> +++ b/fs/xfs/xfs_ioctl32.c >> @@ -17,6 +17,8 @@ >> #include "xfs_itable.h" >> #include "xfs_fsops.h" >> #include "xfs_rtalloc.h" >> +#include "xfs_da_format.h" >> +#include "xfs_da_btree.h" >> #include "xfs_attr.h" >> #include "xfs_ioctl.h" >> #include "xfs_ioctl32.h" >> diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c >> index aef346e..68b9cd0 100644 >> --- a/fs/xfs/xfs_iops.c >> +++ b/fs/xfs/xfs_iops.c >> @@ -13,6 +13,8 @@ >> #include "xfs_inode.h" >> #include "xfs_acl.h" >> #include "xfs_quota.h" >> +#include "xfs_da_format.h" >> +#include "xfs_da_btree.h" >> #include "xfs_attr.h" >> #include "xfs_trans.h" >> #include "xfs_trace.h" >> diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c >> index 6c5321d..0f0ebab 100644 >> --- a/fs/xfs/xfs_xattr.c >> +++ b/fs/xfs/xfs_xattr.c >> @@ -10,6 +10,7 @@ >> #include "xfs_log_format.h" >> #include "xfs_da_format.h" >> #include "xfs_inode.h" >> +#include "xfs_da_btree.h" >> #include "xfs_attr.h" >> >> #include <linux/posix_acl_xattr.h> >> -- >> 2.7.4 >> >
diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h index bed4f40..ef23ed8 100644 --- a/fs/xfs/libxfs/xfs_da_btree.h +++ b/fs/xfs/libxfs/xfs_da_btree.h @@ -42,6 +42,33 @@ enum xfs_dacmp { XFS_CMP_CASE /* names are same but differ in case */ }; +enum xfs_attr_state { + XFS_DC_INIT = 1, /* Init delay info */ + XFS_DC_SF_TO_LEAF = 2, /* Converted short form to leaf */ + XFS_DC_FOUND_LBLK = 3, /* We found leaf blk for attr */ + XFS_DC_LEAF_TO_NODE = 4, /* Converted leaf to node */ + XFS_DC_FOUND_NBLK = 5, /* We found node blk for attr */ + XFS_DC_ALLOC_LEAF = 6, /* We are allocating leaf blocks */ + XFS_DC_ALLOC_NODE = 7, /* We are allocating node blocks */ + XFS_DC_RM_INVALIDATE = 8, /* We are invalidating blocks */ + XFS_DC_RM_SHRINK = 9, /* We are shrinking the tree */ + XFS_DC_RM_NODE_BLKS = 10,/* We are removing node blocks */ +}; + +/* + * Context used for keeping track of delayed attribute operations + */ +struct xfs_delay_context { + enum xfs_attr_state dc_state; + struct xfs_buf *leaf_bp; + struct xfs_bmbt_irec map; + xfs_dablk_t lblkno; + xfs_fileoff_t lfileoff; + int blkcnt; + struct xfs_da_state *da_state; + struct xfs_da_state_blk *blk; +}; + /* * Structure to ease passing around component names. */ @@ -69,6 +96,7 @@ typedef struct xfs_da_args { int rmtvaluelen2; /* remote attr value length in bytes */ int op_flags; /* operation flags */ enum xfs_dacmp cmpresult; /* name compare result for lookups */ + struct xfs_delay_context dc; /* context used for delay attr ops */ } xfs_da_args_t; /* diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c index 1887605..9a649d1 100644 --- a/fs/xfs/scrub/common.c +++ b/fs/xfs/scrub/common.c @@ -24,6 +24,8 @@ #include "xfs_rmap_btree.h" #include "xfs_log.h" #include "xfs_trans_priv.h" +#include "xfs_da_format.h" +#include "xfs_da_btree.h" #include "xfs_attr.h" #include "xfs_reflink.h" #include "scrub/scrub.h" diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c index e868755..1336477 100644 --- a/fs/xfs/xfs_acl.c +++ b/fs/xfs/xfs_acl.c @@ -10,6 +10,8 @@ #include "xfs_trans_resv.h" #include "xfs_mount.h" #include "xfs_inode.h" +#include "xfs_da_format.h" +#include "xfs_da_btree.h" #include "xfs_attr.h" #include "xfs_trace.h" #include <linux/posix_acl_xattr.h> diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c index fab416c..e395864 100644 --- a/fs/xfs/xfs_attr_list.c +++ b/fs/xfs/xfs_attr_list.c @@ -12,6 +12,7 @@ #include "xfs_trans_resv.h" #include "xfs_mount.h" #include "xfs_da_format.h" +#include "xfs_da_btree.h" #include "xfs_inode.h" #include "xfs_trans.h" #include "xfs_bmap.h" diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index ae0ed88..23b0ca6 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -15,6 +15,8 @@ #include "xfs_iwalk.h" #include "xfs_itable.h" #include "xfs_error.h" +#include "xfs_da_format.h" +#include "xfs_da_btree.h" #include "xfs_attr.h" #include "xfs_bmap.h" #include "xfs_bmap_util.h" diff --git a/fs/xfs/xfs_ioctl32.c b/fs/xfs/xfs_ioctl32.c index 3c0d518..e3278ac 100644 --- a/fs/xfs/xfs_ioctl32.c +++ b/fs/xfs/xfs_ioctl32.c @@ -17,6 +17,8 @@ #include "xfs_itable.h" #include "xfs_fsops.h" #include "xfs_rtalloc.h" +#include "xfs_da_format.h" +#include "xfs_da_btree.h" #include "xfs_attr.h" #include "xfs_ioctl.h" #include "xfs_ioctl32.h" diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index aef346e..68b9cd0 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -13,6 +13,8 @@ #include "xfs_inode.h" #include "xfs_acl.h" #include "xfs_quota.h" +#include "xfs_da_format.h" +#include "xfs_da_btree.h" #include "xfs_attr.h" #include "xfs_trans.h" #include "xfs_trace.h" diff --git a/fs/xfs/xfs_xattr.c b/fs/xfs/xfs_xattr.c index 6c5321d..0f0ebab 100644 --- a/fs/xfs/xfs_xattr.c +++ b/fs/xfs/xfs_xattr.c @@ -10,6 +10,7 @@ #include "xfs_log_format.h" #include "xfs_da_format.h" #include "xfs_inode.h" +#include "xfs_da_btree.h" #include "xfs_attr.h" #include <linux/posix_acl_xattr.h>
This patch adds a new struct xfs_delay_context, which we will use to keep track of the current state of a delayed attribute operation. The new 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. Signed-off-by: Allison Collins <allison.henderson@oracle.com> --- fs/xfs/libxfs/xfs_da_btree.h | 28 ++++++++++++++++++++++++++++ fs/xfs/scrub/common.c | 2 ++ fs/xfs/xfs_acl.c | 2 ++ fs/xfs/xfs_attr_list.c | 1 + fs/xfs/xfs_ioctl.c | 2 ++ fs/xfs/xfs_ioctl32.c | 2 ++ fs/xfs/xfs_iops.c | 2 ++ fs/xfs/xfs_xattr.c | 1 + 8 files changed, 40 insertions(+)