From: Darrick J. Wong <djwong@xxxxxxxxxx>
Ideally, we'd put all the metadata inodes in one place if we could, so
that the metadata all stay reasonably close together instead of
spreading out over the disk. Furthermore, if the log is internal we'd
probably prefer to keep the metadata near the log. Therefore, disable
AGI rotoring for metadata inode allocations.
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
libxfs/util.c | 3 ---
libxfs/xfs_ialloc.c | 16 +++++++++-------
libxfs/xfs_ialloc.h | 2 +-
libxfs/xfs_imeta.c | 4 ++--
mkfs/proto.c | 3 +--
repair/phase6.c | 2 +-
6 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/libxfs/util.c b/libxfs/util.c
index fec26e6d30f..7b16d30b754 100644
--- a/libxfs/util.c
+++ b/libxfs/util.c
@@ -467,9 +467,6 @@ libxfs_imeta_mkdir(
uint resblks;
int error;
- /* Try to place metadata directories in AG 0. */
- mp->m_agirotor = 0;
-
error = xfs_imeta_start_update(mp, path, &upd);
if (error)
return error;
diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
index 9ce36b2cd8d..e7cafdd395b 100644
--- a/libxfs/xfs_ialloc.c
+++ b/libxfs/xfs_ialloc.c
@@ -1793,26 +1793,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);
diff --git a/libxfs/xfs_ialloc.h b/libxfs/xfs_ialloc.h
index f4dc97bb8e8..adf60dc56e7 100644
--- a/libxfs/xfs_ialloc.h
+++ b/libxfs/xfs_ialloc.h
@@ -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,
diff --git a/libxfs/xfs_imeta.c b/libxfs/xfs_imeta.c
index 9e92186b58c..1502d4eb2e3 100644
--- a/libxfs/xfs_imeta.c
+++ b/libxfs/xfs_imeta.c
@@ -231,7 +231,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);
@@ -641,7 +641,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);
diff --git a/mkfs/proto.c b/mkfs/proto.c
index f15cbea84c7..6fb58bd7cd4 100644
--- a/mkfs/proto.c
+++ b/mkfs/proto.c
@@ -380,7 +380,6 @@ creatproto(
XFS_ICREATE_ARGS_FORCE_MODE,
};
struct xfs_inode *ip;
- xfs_ino_t parent_ino = dp ? dp->i_ino : 0;
xfs_ino_t ino;
int error;
@@ -388,7 +387,7 @@ creatproto(
* Call the space management code to pick the on-disk inode to be
* allocated.
*/
- error = -libxfs_dialloc(tpp, parent_ino, mode, &ino);
+ error = -libxfs_dialloc(tpp, dp, mode, &ino);
if (error)
return error;
diff --git a/repair/phase6.c b/repair/phase6.c
index f8f42eb6e29..90413251b56 100644
--- a/repair/phase6.c
+++ b/repair/phase6.c
@@ -846,7 +846,7 @@ mk_orphanage(
if (i)
res_failed(i);
- error = -libxfs_dialloc(&tp, mp->m_sb.sb_rootino, mode, &ino);
+ error = -libxfs_dialloc(&tp, pip, mode, &ino);
if (error)
do_error(_("%s inode allocation failed %d\n"),
ORPHANAGE, error);
