On Tue, Oct 25, 2022 at 12:13:47PM -0700, Darrick J. Wong wrote:
> On Fri, Oct 21, 2022 at 03:29:15PM -0700, allison.henderson@xxxxxxxxxx wrote:
> > From: Allison Henderson <allison.henderson@xxxxxxxxxx>
> >
> > Tmp files are used as part of rename operations and will need attr forks
> > initialized for parent pointers. Expose the init_xattrs parameter to
> > the calling function to initialize the fork.
> >
> > Signed-off-by: Allison Henderson <allison.henderson@xxxxxxxxxx>
> > ---
> > fs/xfs/xfs_inode.c | 5 +++--
> > fs/xfs/xfs_inode.h | 2 +-
> > fs/xfs/xfs_iops.c | 3 ++-
> > 3 files changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> > index 44b68fa53a72..8b3aefd146a2 100644
> > --- a/fs/xfs/xfs_inode.c
> > +++ b/fs/xfs/xfs_inode.c
> > @@ -1108,6 +1108,7 @@ xfs_create_tmpfile(
> > struct user_namespace *mnt_userns,
> > struct xfs_inode *dp,
> > umode_t mode,
> > + bool init_xattrs,
> > struct xfs_inode **ipp)
> > {
> > struct xfs_mount *mp = dp->i_mount;
> > @@ -1148,7 +1149,7 @@ xfs_create_tmpfile(
> > error = xfs_dialloc(&tp, dp->i_ino, mode, &ino);
> > if (!error)
> > error = xfs_init_new_inode(mnt_userns, tp, dp, ino, mode,
> > - 0, 0, prid, false, &ip);
> > + 0, 0, prid, init_xattrs, &ip);
> > if (error)
> > goto out_trans_cancel;
> >
> > @@ -2748,7 +2749,7 @@ xfs_rename_alloc_whiteout(
> > int error;
> >
> > error = xfs_create_tmpfile(mnt_userns, dp, S_IFCHR | WHITEOUT_MODE,
> > - &tmpfile);
> > + false, &tmpfile);
>
> Similar question to last time -- shouldn't we initialize the attr fork
> at whiteout creation time if we know that we're about to add the new
> file to a directory? IOWs, s/false/xfs_has_parent(mp)/ here?
Aha, you *do* do that later.
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
--D
> --D
>
> > if (error)
> > return error;
> >
> > diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h
> > index 2eaed98af814..5735de32beeb 100644
> > --- a/fs/xfs/xfs_inode.h
> > +++ b/fs/xfs/xfs_inode.h
> > @@ -478,7 +478,7 @@ int xfs_create(struct user_namespace *mnt_userns,
> > umode_t mode, dev_t rdev, bool need_xattr,
> > struct xfs_inode **ipp);
> > int xfs_create_tmpfile(struct user_namespace *mnt_userns,
> > - struct xfs_inode *dp, umode_t mode,
> > + struct xfs_inode *dp, umode_t mode, bool init_xattrs,
> > struct xfs_inode **ipp);
> > int xfs_remove(struct xfs_inode *dp, struct xfs_name *name,
> > struct xfs_inode *ip);
> > diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
> > index 2e10e1c66ad6..10a5e85f2a70 100644
> > --- a/fs/xfs/xfs_iops.c
> > +++ b/fs/xfs/xfs_iops.c
> > @@ -200,7 +200,8 @@ xfs_generic_create(
> > xfs_create_need_xattr(dir, default_acl, acl),
> > &ip);
> > } else {
> > - error = xfs_create_tmpfile(mnt_userns, XFS_I(dir), mode, &ip);
> > + error = xfs_create_tmpfile(mnt_userns, XFS_I(dir), mode, false,
> > + &ip);
> > }
> > if (unlikely(error))
> > goto out_free_acl;
> > --
> > 2.25.1
> >
