xfs: remove xfs_filestream_associate
There is no good reason to create a filestream when a directory entry
is created. Delay it until the first allocation happens to simply
the code and reduce the amount of mru cache lookups we do.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
diff --git a/fs/xfs/xfs_filestream.c b/fs/xfs/xfs_filestream.c
index 7b94036..c8a8840 100644
--- a/fs/xfs/xfs_filestream.c
+++ b/fs/xfs/xfs_filestream.c
@@ -318,17 +318,18 @@
}
/*
- * Return the AG of the filestream the file or directory belongs to, or
- * NULLAGNUMBER otherwise.
+ * Find the right allocation group for a file, either by finding an
+ * existing file stream or creating a new one.
+ *
+ * Returns NULLAGNUMBER in case of an error.
*/
xfs_agnumber_t
xfs_filestream_lookup_ag(
struct xfs_inode *ip)
{
struct xfs_mount *mp = ip->i_mount;
- struct xfs_fstrm_item *item;
struct xfs_inode *pip = NULL;
- xfs_agnumber_t ag = NULLAGNUMBER;
+ xfs_agnumber_t startag, ag = NULLAGNUMBER;
int ref = 0;
struct xfs_mru_cache_elem *mru;
@@ -339,45 +340,13 @@
goto out;
mru = xfs_mru_cache_lookup(mp->m_filestream, pip->i_ino);
- if (!mru)
- goto out;
-
- item = container_of(mru, struct xfs_fstrm_item, mru);
-
- ag = item->ag;
- xfs_mru_cache_done(mp->m_filestream);
-
- ref = xfs_filestream_peek_ag(ip->i_mount, ag);
-out:
- TRACE_LOOKUP(mp, ip, pip, ag, ref);
- IRELE(pip);
- return ag;
-}
-
-/*
- * Make sure a directory has a filestream associated with it.
- *
- * This is called when creating regular files in an directory that has
- * filestreams enabled, so that a stream is ready by the time we need it
- * in the allocator for the files inside the directory.
- */
-int
-xfs_filestream_associate(
- struct xfs_inode *pip)
-{
- struct xfs_mount *mp = pip->i_mount;
- struct xfs_mru_cache_elem *mru;
- xfs_agnumber_t startag, ag;
-
- ASSERT(S_ISDIR(pip->i_d.di_mode));
-
- /*
- * If the directory already has a file stream associated we're done.
- */
- mru = xfs_mru_cache_lookup(mp->m_filestream, pip->i_ino);
if (mru) {
+ ag = container_of(mru, struct xfs_fstrm_item, mru)->ag;
xfs_mru_cache_done(mp->m_filestream);
- return 0;
+
+ ref = xfs_filestream_peek_ag(ip->i_mount, ag);
+ TRACE_LOOKUP(mp, ip, pip, ag, ref);
+ goto out;
}
/*
@@ -392,7 +361,11 @@
} else
startag = XFS_INO_TO_AGNO(mp, pip->i_ino);
- return xfs_filestream_pick_ag(pip, startag, &ag, 0, 0);
+ if (xfs_filestream_pick_ag(pip, startag, &ag, 0, 0))
+ ag = NULLAGNUMBER;
+out:
+ IRELE(pip);
+ return ag;
}
/*