diff options
author | Darrick J. Wong <darrick.wong@oracle.com> | 2020-10-25 17:15:53 -0700 |
---|---|---|
committer | Darrick J. Wong <darrick.wong@oracle.com> | 2020-10-26 18:32:26 -0700 |
commit | 7afab65b0bb85a0d7d1ca387049b4eab390e103e (patch) | |
tree | 45b2e0bf0fac2bc2e29930d0bb4f0a14b0b5d7b7 | |
parent | 9be4e0787aad9bd3ab90aae8c535ff91147742f6 (diff) |
xfs: pack inode allocation parameters into a separate structure
Instead of open-coding new inode parameters through xfs_dir_ialloc and
xfs_Ialloc, put everything into a structure and pass that instead. This
will make it easier to share code with xfsprogs while maintaining the
ability for xfsprogs to supply extra new inode parameters.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
-rw-r--r-- | fs/xfs/libxfs/xfs_inode_util.h | 14 | ||||
-rw-r--r-- | fs/xfs/xfs_inode.c | 60 |
2 files changed, 46 insertions, 28 deletions
diff --git a/fs/xfs/libxfs/xfs_inode_util.h b/fs/xfs/libxfs/xfs_inode_util.h index f292bdd09976..51bc311d3c49 100644 --- a/fs/xfs/libxfs/xfs_inode_util.h +++ b/fs/xfs/libxfs/xfs_inode_util.h @@ -13,4 +13,18 @@ uint32_t xfs_dic2xflags(uint16_t di_flags, uint64_t di_flags2, prid_t xfs_get_initial_prid(struct xfs_inode *dp); +/* Initial ids, link count, device number, and mode of a new inode. */ +struct xfs_ialloc_args { + struct xfs_inode *pip; /* parent inode or null */ + + kuid_t uid; + kgid_t gid; + prid_t prid; + + xfs_nlink_t nlink; + dev_t rdev; + + umode_t mode; +}; + #endif /* __XFS_INODE_UTIL_H__ */ diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 1db1e5dd25c9..ec608d79c8f9 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -696,28 +696,25 @@ xfs_inode_inherit_flags2( */ static int xfs_ialloc( - xfs_trans_t *tp, - xfs_inode_t *pip, - umode_t mode, - xfs_nlink_t nlink, - dev_t rdev, - prid_t prid, - xfs_buf_t **ialloc_context, - xfs_inode_t **ipp) + struct xfs_trans *tp, + const struct xfs_ialloc_args *args, + struct xfs_buf **ialloc_context, + struct xfs_inode **ipp) { - struct xfs_mount *mp = tp->t_mountp; - xfs_ino_t ino; - xfs_inode_t *ip; - uint flags; - int error; - struct timespec64 tv; - struct inode *inode; + struct xfs_mount *mp = tp->t_mountp; + struct xfs_inode *pip = args->pip; + struct xfs_inode *ip; + struct inode *inode; + xfs_ino_t ino; + uint flags; + int error; + struct timespec64 tv; /* * Call the space management code to pick * the on-disk inode to be allocated. */ - error = xfs_dialloc(tp, pip ? pip->i_ino : 0, mode, + error = xfs_dialloc(tp, pip ? pip->i_ino : 0, args->mode, ialloc_context, &ino); if (error) return error; @@ -752,18 +749,18 @@ xfs_ialloc( return error; ASSERT(ip != NULL); inode = VFS_I(ip); - inode->i_mode = mode; - set_nlink(inode, nlink); - inode->i_uid = current_fsuid(); - inode->i_rdev = rdev; - ip->i_d.di_projid = prid; + inode->i_mode = args->mode; + set_nlink(inode, args->nlink); + inode->i_uid = args->uid; + inode->i_rdev = args->rdev; + ip->i_d.di_projid = args->prid; if (pip && XFS_INHERIT_GID(pip)) { inode->i_gid = VFS_I(pip)->i_gid; - if ((VFS_I(pip)->i_mode & S_ISGID) && S_ISDIR(mode)) + if ((VFS_I(pip)->i_mode & S_ISGID) && S_ISDIR(args->mode)) inode->i_mode |= S_ISGID; } else { - inode->i_gid = current_fsgid(); + inode->i_gid = args->gid; } /* @@ -797,7 +794,7 @@ xfs_ialloc( } flags = XFS_ILOG_CORE; - switch (mode & S_IFMT) { + switch (args->mode & S_IFMT) { case S_IFIFO: case S_IFCHR: case S_IFBLK: @@ -859,6 +856,15 @@ xfs_dir_ialloc( xfs_inode_t **ipp) /* pointer to inode; it will be locked. */ { + struct xfs_ialloc_args args = { + .pip = dp, + .uid = current_fsuid(), + .gid = current_fsgid(), + .prid = prid, + .nlink = nlink, + .rdev = rdev, + .mode = mode, + }; xfs_trans_t *tp; xfs_inode_t *ip; xfs_buf_t *ialloc_context = NULL; @@ -884,8 +890,7 @@ xfs_dir_ialloc( * transaction commit so that no other process can steal * the inode(s) that we've just allocated. */ - code = xfs_ialloc(tp, dp, mode, nlink, rdev, prid, &ialloc_context, - &ip); + code = xfs_ialloc(tp, &args, &ialloc_context, &ip); /* * Return an error if we were unable to allocate a new inode. @@ -954,8 +959,7 @@ xfs_dir_ialloc( * other allocations in this allocation group, * this call should always succeed. */ - code = xfs_ialloc(tp, dp, mode, nlink, rdev, prid, - &ialloc_context, &ip); + code = xfs_ialloc(tp, &args, &ialloc_context, &ip); /* * If we get an error at this point, return to the caller |