mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 04:18:39 +08:00
xfs: pass the icreate args object to xfs_dialloc
Pass the xfs_icreate_args object to xfs_dialloc since we can extract the relevant mode (really just the file type) and parent inumber from there. This simplifies the calling convention in preparation for the next patch. Signed-off-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
parent
feb09b727b
commit
390b4775d6
@ -1855,11 +1855,12 @@ out_release:
|
||||
int
|
||||
xfs_dialloc(
|
||||
struct xfs_trans **tpp,
|
||||
xfs_ino_t parent,
|
||||
umode_t mode,
|
||||
const struct xfs_icreate_args *args,
|
||||
xfs_ino_t *new_ino)
|
||||
{
|
||||
struct xfs_mount *mp = (*tpp)->t_mountp;
|
||||
xfs_ino_t parent = args->pip ? args->pip->i_ino : 0;
|
||||
umode_t mode = args->mode & S_IFMT;
|
||||
xfs_agnumber_t agno;
|
||||
int error = 0;
|
||||
xfs_agnumber_t start_agno;
|
||||
|
@ -33,11 +33,13 @@ xfs_make_iptr(struct xfs_mount *mp, struct xfs_buf *b, int o)
|
||||
return xfs_buf_offset(b, o << (mp)->m_sb.sb_inodelog);
|
||||
}
|
||||
|
||||
struct xfs_icreate_args;
|
||||
|
||||
/*
|
||||
* Allocate an inode on disk. Mode is used to tell whether the new inode will
|
||||
* need space, and whether it is a directory.
|
||||
*/
|
||||
int xfs_dialloc(struct xfs_trans **tpp, xfs_ino_t parent, umode_t mode,
|
||||
int xfs_dialloc(struct xfs_trans **tpp, const struct xfs_icreate_args *args,
|
||||
xfs_ino_t *new_ino);
|
||||
|
||||
int xfs_difree(struct xfs_trans *tp, struct xfs_perag *pag,
|
||||
|
@ -88,7 +88,7 @@ xrep_tempfile_create(
|
||||
goto out_release_dquots;
|
||||
|
||||
/* Allocate inode, set up directory. */
|
||||
error = xfs_dialloc(&tp, dp->i_ino, mode, &ino);
|
||||
error = xfs_dialloc(&tp, &args, &ino);
|
||||
if (error)
|
||||
goto out_trans_cancel;
|
||||
error = xfs_icreate(tp, ino, &args, &sc->tempip);
|
||||
|
@ -704,7 +704,7 @@ xfs_create(
|
||||
* entry pointing to them, but a directory also the "." entry
|
||||
* pointing to itself.
|
||||
*/
|
||||
error = xfs_dialloc(&tp, dp->i_ino, args->mode, &ino);
|
||||
error = xfs_dialloc(&tp, args, &ino);
|
||||
if (!error)
|
||||
error = xfs_icreate(tp, ino, args, &du.ip);
|
||||
if (error)
|
||||
@ -812,7 +812,7 @@ xfs_create_tmpfile(
|
||||
if (error)
|
||||
goto out_release_dquots;
|
||||
|
||||
error = xfs_dialloc(&tp, dp->i_ino, args->mode, &ino);
|
||||
error = xfs_dialloc(&tp, args, &ino);
|
||||
if (!error)
|
||||
error = xfs_icreate(tp, ino, args, &ip);
|
||||
if (error)
|
||||
|
@ -799,7 +799,7 @@ xfs_qm_qino_alloc(
|
||||
};
|
||||
xfs_ino_t ino;
|
||||
|
||||
error = xfs_dialloc(&tp, 0, S_IFREG, &ino);
|
||||
error = xfs_dialloc(&tp, &args, &ino);
|
||||
if (!error)
|
||||
error = xfs_icreate(tp, ino, &args, ipp);
|
||||
if (error) {
|
||||
|
@ -165,7 +165,7 @@ xfs_symlink(
|
||||
/*
|
||||
* Allocate an inode for the symlink.
|
||||
*/
|
||||
error = xfs_dialloc(&tp, dp->i_ino, S_IFLNK, &ino);
|
||||
error = xfs_dialloc(&tp, &args, &ino);
|
||||
if (!error)
|
||||
error = xfs_icreate(tp, ino, &args, &du.ip);
|
||||
if (error)
|
||||
|
Loading…
Reference in New Issue
Block a user