@@ -1798,26 +1798,28 @@ xfs_dialloc_try_ag(
int
xfs_dialloc(
struct xfs_trans **tpp,
- xfs_ino_t parent,
+ struct xfs_inode *pip,
umode_t mode,
xfs_ino_t *new_ino)
{
struct xfs_mount *mp = (*tpp)->t_mountp;
+ struct xfs_perag *pag;
+ struct xfs_ino_geometry *igeo = M_IGEO(mp);
+ xfs_ino_t ino;
+ xfs_ino_t parent = pip ? pip->i_ino : 0;
xfs_agnumber_t agno;
- int error = 0;
xfs_agnumber_t start_agno;
- struct xfs_perag *pag;
- struct xfs_ino_geometry *igeo = M_IGEO(mp);
bool ok_alloc = true;
int flags;
- xfs_ino_t ino;
+ int error = 0;
/*
* Directories, symlinks, and regular files frequently allocate at least
* one block, so factor that potential expansion when we examine whether
- * an AG has enough space for file creation.
+ * an AG has enough space for file creation. Try to keep metadata
+ * files all in the same AG.
*/
- if (S_ISDIR(mode))
+ if (S_ISDIR(mode) && (!pip || !xfs_is_metadata_inode(pip)))
start_agno = xfs_ialloc_next_ag(mp);
else {
start_agno = XFS_INO_TO_AGNO(mp, parent);
@@ -36,7 +36,7 @@ xfs_make_iptr(struct xfs_mount *mp, struct xfs_buf *b, int o)
* 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, struct xfs_inode *dp, umode_t mode,
xfs_ino_t *new_ino);
int xfs_difree(struct xfs_trans *tp, struct xfs_perag *pag,
@@ -232,7 +232,7 @@ xfs_imeta_sb_create(
return -EEXIST;
/* Create a new inode and set the sb pointer. */
- error = xfs_dialloc(tpp, 0, mode, &ino);
+ error = xfs_dialloc(tpp, NULL, mode, &ino);
if (error)
return error;
error = xfs_icreate(*tpp, ino, &args, ipp);
@@ -642,7 +642,7 @@ xfs_imeta_dir_create(
* entry pointing to them, but a directory also the "." entry
* pointing to itself.
*/
- error = xfs_dialloc(tpp, dp->i_ino, mode, &ino);
+ error = xfs_dialloc(tpp, dp, mode, &ino);
if (error)
goto out_ilock;
error = xfs_icreate(*tpp, ino, &args, ipp);
@@ -87,7 +87,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, dp, mode, &ino);
if (error)
goto out_trans_cancel;
error = xfs_icreate(tp, ino, &args, &sc->tempip);
@@ -864,7 +864,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, dp, args->mode, &ino);
if (!error)
error = xfs_icreate(tp, ino, args, &ip);
if (error)
@@ -980,7 +980,7 @@ xfs_create_tmpfile(
if (error)
goto out_release_dquots;
- error = xfs_dialloc(&tp, dp->i_ino, args->mode, &ino);
+ error = xfs_dialloc(&tp, dp, args->mode, &ino);
if (!error)
error = xfs_icreate(tp, ino, args, &ip);
if (error)
@@ -158,7 +158,7 @@ xfs_symlink(
/*
* Allocate an inode for the symlink.
*/
- error = xfs_dialloc(&tp, dp->i_ino, S_IFLNK, &ino);
+ error = xfs_dialloc(&tp, dp, S_IFLNK, &ino);
if (!error)
error = xfs_icreate(tp, ino, &args, &ip);
if (error)