On Wed, 2022-06-29 at 11:33 -0700, Darrick J. Wong wrote:
> On Sat, Jun 11, 2022 at 02:41:49AM -0700, Allison Henderson wrote:
> > Add the new parent attribute type. XFS_ATTR_PARENT is used only for
> > parent pointer
> > entries; it uses reserved blocks like XFS_ATTR_ROOT.
> >
> > [dchinner: forward ported and cleaned up]
> > [achender: rebased]
> >
> > Signed-off-by: Mark Tinguely <tinguely@xxxxxxx>
> > Signed-off-by: Dave Chinner <dchinner@xxxxxxxxxx>
> > Signed-off-by: Allison Henderson <allison.henderson@xxxxxxxxxx>
> > ---
> > fs/xfs/libxfs/xfs_attr.c | 4 +++-
> > fs/xfs/libxfs/xfs_da_format.h | 5 ++++-
> > fs/xfs/libxfs/xfs_log_format.h | 1 +
> > 3 files changed, 8 insertions(+), 2 deletions(-)
> >
> > diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
> > index a94850d9b8b1..ee5dfebcf163 100644
> > --- a/fs/xfs/libxfs/xfs_attr.c
> > +++ b/fs/xfs/libxfs/xfs_attr.c
> > @@ -996,11 +996,13 @@ xfs_attr_set(
> > struct xfs_inode *dp = args->dp;
> > struct xfs_mount *mp = dp->i_mount;
> > struct xfs_trans_res tres;
> > - bool rsvd = (args->attr_filter &
> > XFS_ATTR_ROOT);
> > + bool rsvd;
> > int error, local;
> > int rmt_blks = 0;
> > unsigned int total;
> >
> > + rsvd = (args->attr_filter & (XFS_ATTR_ROOT | XFS_ATTR_PARENT))
> > != 0;
> > +
> > if (xfs_is_shutdown(dp->i_mount))
> > return -EIO;
> >
> > diff --git a/fs/xfs/libxfs/xfs_da_format.h
> > b/fs/xfs/libxfs/xfs_da_format.h
> > index 25e2841084e1..2d771e6429f2 100644
> > --- a/fs/xfs/libxfs/xfs_da_format.h
> > +++ b/fs/xfs/libxfs/xfs_da_format.h
> > @@ -688,12 +688,15 @@ struct xfs_attr3_leafblock {
> > #define XFS_ATTR_LOCAL_BIT 0 /* attr is stored locally
> > */
> > #define XFS_ATTR_ROOT_BIT 1 /* limit access to trusted
> > attrs */
> > #define XFS_ATTR_SECURE_BIT 2 /* limit access to secure
> > attrs */
> > +#define XFS_ATTR_PARENT_BIT 3 /* parent pointer secure
> > attrs */
>
> ^ whitespace
>
> What is 'secure' about parent pointers?
Nothing, it's a typo :-)
> Could the comment simply read:
>
> /* parent pointer attrs */
>
> ?
>
Yes, will fix. Thx for the catch
Allison
> (The rest looks fine...)
>
> --D
>
> > #define XFS_ATTR_INCOMPLETE_BIT 7 /* attr in middle
> > of create/delete */
> > #define XFS_ATTR_LOCAL (1u << XFS_ATTR_LOCAL_BIT)
> > #define XFS_ATTR_ROOT (1u << XFS_ATTR_ROOT_BIT)
> > #define XFS_ATTR_SECURE (1u << XFS_ATTR_SECURE_BIT)
> > +#define XFS_ATTR_PARENT (1u << XFS_ATTR_PARENT_BIT)
> > #define XFS_ATTR_INCOMPLETE (1u << XFS_ATTR_INCOMPLETE_BIT)
> > -#define XFS_ATTR_NSP_ONDISK_MASK (XFS_ATTR_ROOT |
> > XFS_ATTR_SECURE)
> > +#define XFS_ATTR_NSP_ONDISK_MASK \
> > + (XFS_ATTR_ROOT | XFS_ATTR_SECURE |
> > XFS_ATTR_PARENT)
> >
> > /*
> > * Alignment for namelist and valuelist entries (since they are
> > mixed
> > diff --git a/fs/xfs/libxfs/xfs_log_format.h
> > b/fs/xfs/libxfs/xfs_log_format.h
> > index b351b9dc6561..eea53874fde8 100644
> > --- a/fs/xfs/libxfs/xfs_log_format.h
> > +++ b/fs/xfs/libxfs/xfs_log_format.h
> > @@ -917,6 +917,7 @@ struct xfs_icreate_log {
> > */
> > #define XFS_ATTRI_FILTER_MASK (XFS_ATTR_ROOT | \
> > XFS_ATTR_SECURE | \
> > + XFS_ATTR_PARENT | \
> > XFS_ATTR_INCOMPLETE)
> >
> > /*
> > --
> > 2.25.1
> >
