| Message ID | 20190809213726.32336-18-allison.henderson@oracle.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Delayed Attributes | expand |
On Fri, Aug 09, 2019 at 02:37:25PM -0700, Allison Collins wrote: > Finally enable delayed attributes in xfs_attr_set and > xfs_attr_remove. We only do this for v4 and up since we > cant add new log entries to old fs versions ...you can't add new log item types to *existing* fs versions, which includes everything through present-day v5. This needs a separate feature bit somewhere to prevent existing xfs drivers from crashing and burning on attri/attrd items. Most of this deferred attr code could exist independently from the parent pointer feature, so I guess you could be the first person to use one of the log incompat feature bits? That would be one way to get wider testing of deferred attrs while we work on parent pointers. --D > Signed-off-by: Allison Collins <allison.henderson@oracle.com> > --- > fs/xfs/libxfs/xfs_attr.c | 26 ++++++++++++++++++++++++-- > 1 file changed, 24 insertions(+), 2 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c > index 9931e50..7023734 100644 > --- a/fs/xfs/libxfs/xfs_attr.c > +++ b/fs/xfs/libxfs/xfs_attr.c > @@ -506,6 +506,7 @@ xfs_attr_set( > int valuelen) > { > struct xfs_mount *mp = dp->i_mount; > + struct xfs_sb *sbp = &mp->m_sb; > struct xfs_da_args args; > struct xfs_trans_res tres; > int rsvd = (name->type & ATTR_ROOT) != 0; > @@ -564,7 +565,20 @@ xfs_attr_set( > goto out_trans_cancel; > > xfs_trans_ijoin(args.trans, dp, 0); > - error = xfs_attr_set_args(&args); > + if (XFS_SB_VERSION_NUM(sbp) < XFS_SB_VERSION_4) > + error = xfs_attr_set_args(&args); > + else { > + error = xfs_has_attr(&args); > + > + if (error == -EEXIST && (name->type & ATTR_CREATE)) > + goto out_trans_cancel; > + > + if (error == -ENOATTR && (name->type & ATTR_REPLACE)) > + goto out_trans_cancel; > + > + error = xfs_attr_set_deferred(dp, args.trans, name, value, > + valuelen); > + } > if (error) > goto out_trans_cancel; > if (!args.trans) { > @@ -649,6 +663,7 @@ xfs_attr_remove( > struct xfs_name *name) > { > struct xfs_mount *mp = dp->i_mount; > + struct xfs_sb *sbp = &mp->m_sb; > struct xfs_da_args args; > int error; > > @@ -690,7 +705,14 @@ xfs_attr_remove( > */ > xfs_trans_ijoin(args.trans, dp, 0); > > - error = xfs_attr_remove_args(&args); > + error = xfs_has_attr(&args); > + if (error == -ENOATTR) > + goto out; > + > + if (XFS_SB_VERSION_NUM(sbp) < XFS_SB_VERSION_4) > + error = xfs_attr_remove_args(&args); > + else > + error = xfs_attr_remove_deferred(dp, args.trans, name); > if (error) > goto out; > > -- > 2.7.4 >
On 8/12/19 9:42 AM, Darrick J. Wong wrote: > On Fri, Aug 09, 2019 at 02:37:25PM -0700, Allison Collins wrote: >> Finally enable delayed attributes in xfs_attr_set and >> xfs_attr_remove. We only do this for v4 and up since we >> cant add new log entries to old fs versions > > ...you can't add new log item types to *existing* fs versions, which > includes everything through present-day v5. > > This needs a separate feature bit somewhere to prevent existing xfs > drivers from crashing and burning on attri/attrd items. Most of this > deferred attr code could exist independently from the parent pointer > feature, so I guess you could be the first person to use one of the log > incompat feature bits? That would be one way to get wider testing of > deferred attrs while we work on parent pointers. Ok, that sounds good then, I will look into plumbing in a feature bit for it. Thx! Allison > > --D > >> Signed-off-by: Allison Collins <allison.henderson@oracle.com> >> --- >> fs/xfs/libxfs/xfs_attr.c | 26 ++++++++++++++++++++++++-- >> 1 file changed, 24 insertions(+), 2 deletions(-) >> >> diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c >> index 9931e50..7023734 100644 >> --- a/fs/xfs/libxfs/xfs_attr.c >> +++ b/fs/xfs/libxfs/xfs_attr.c >> @@ -506,6 +506,7 @@ xfs_attr_set( >> int valuelen) >> { >> struct xfs_mount *mp = dp->i_mount; >> + struct xfs_sb *sbp = &mp->m_sb; >> struct xfs_da_args args; >> struct xfs_trans_res tres; >> int rsvd = (name->type & ATTR_ROOT) != 0; >> @@ -564,7 +565,20 @@ xfs_attr_set( >> goto out_trans_cancel; >> >> xfs_trans_ijoin(args.trans, dp, 0); >> - error = xfs_attr_set_args(&args); >> + if (XFS_SB_VERSION_NUM(sbp) < XFS_SB_VERSION_4) >> + error = xfs_attr_set_args(&args); >> + else { >> + error = xfs_has_attr(&args); >> + >> + if (error == -EEXIST && (name->type & ATTR_CREATE)) >> + goto out_trans_cancel; >> + >> + if (error == -ENOATTR && (name->type & ATTR_REPLACE)) >> + goto out_trans_cancel; >> + >> + error = xfs_attr_set_deferred(dp, args.trans, name, value, >> + valuelen); >> + } >> if (error) >> goto out_trans_cancel; >> if (!args.trans) { >> @@ -649,6 +663,7 @@ xfs_attr_remove( >> struct xfs_name *name) >> { >> struct xfs_mount *mp = dp->i_mount; >> + struct xfs_sb *sbp = &mp->m_sb; >> struct xfs_da_args args; >> int error; >> >> @@ -690,7 +705,14 @@ xfs_attr_remove( >> */ >> xfs_trans_ijoin(args.trans, dp, 0); >> >> - error = xfs_attr_remove_args(&args); >> + error = xfs_has_attr(&args); >> + if (error == -ENOATTR) >> + goto out; >> + >> + if (XFS_SB_VERSION_NUM(sbp) < XFS_SB_VERSION_4) >> + error = xfs_attr_remove_args(&args); >> + else >> + error = xfs_attr_remove_deferred(dp, args.trans, name); >> if (error) >> goto out; >> >> -- >> 2.7.4 >>
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index 9931e50..7023734 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c @@ -506,6 +506,7 @@ xfs_attr_set( int valuelen) { struct xfs_mount *mp = dp->i_mount; + struct xfs_sb *sbp = &mp->m_sb; struct xfs_da_args args; struct xfs_trans_res tres; int rsvd = (name->type & ATTR_ROOT) != 0; @@ -564,7 +565,20 @@ xfs_attr_set( goto out_trans_cancel; xfs_trans_ijoin(args.trans, dp, 0); - error = xfs_attr_set_args(&args); + if (XFS_SB_VERSION_NUM(sbp) < XFS_SB_VERSION_4) + error = xfs_attr_set_args(&args); + else { + error = xfs_has_attr(&args); + + if (error == -EEXIST && (name->type & ATTR_CREATE)) + goto out_trans_cancel; + + if (error == -ENOATTR && (name->type & ATTR_REPLACE)) + goto out_trans_cancel; + + error = xfs_attr_set_deferred(dp, args.trans, name, value, + valuelen); + } if (error) goto out_trans_cancel; if (!args.trans) { @@ -649,6 +663,7 @@ xfs_attr_remove( struct xfs_name *name) { struct xfs_mount *mp = dp->i_mount; + struct xfs_sb *sbp = &mp->m_sb; struct xfs_da_args args; int error; @@ -690,7 +705,14 @@ xfs_attr_remove( */ xfs_trans_ijoin(args.trans, dp, 0); - error = xfs_attr_remove_args(&args); + error = xfs_has_attr(&args); + if (error == -ENOATTR) + goto out; + + if (XFS_SB_VERSION_NUM(sbp) < XFS_SB_VERSION_4) + error = xfs_attr_remove_args(&args); + else + error = xfs_attr_remove_deferred(dp, args.trans, name); if (error) goto out;
Finally enable delayed attributes in xfs_attr_set and xfs_attr_remove. We only do this for v4 and up since we cant add new log entries to old fs versions Signed-off-by: Allison Collins <allison.henderson@oracle.com> --- fs/xfs/libxfs/xfs_attr.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-)