From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
In xfs_iunlink_remove we have two identical calls to
xfs_iunlink_update_inode, so move it out of the if statement to simplify
the code some more.
Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
---
fs/xfs/xfs_inode.c | 34 +++++++++++++---------------------
1 file changed, 13 insertions(+), 21 deletions(-)
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 8af5f4e989ac..fac9562ecd39 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2183,6 +2183,7 @@ xfs_iunlink_remove(
xfs_agnumber_t agno = XFS_INO_TO_AGNO(mp, ip->i_ino);
xfs_agino_t agino = XFS_INO_TO_AGINO(mp, ip->i_ino);
xfs_agino_t next_agino;
+ xfs_agino_t head_agino;
short bucket_index = agino % XFS_AGI_UNLINKED_BUCKETS;
int error;
@@ -2198,24 +2199,24 @@ xfs_iunlink_remove(
* Get the index into the agi hash table for the list this inode will
* go on. Make sure the head pointer isn't garbage.
*/
- next_agino = be32_to_cpu(agi->agi_unlinked[bucket_index]);
- if (!xfs_verify_agino(mp, agno, next_agino)) {
+ head_agino = be32_to_cpu(agi->agi_unlinked[bucket_index]);
+ if (!xfs_verify_agino(mp, agno, head_agino)) {
XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp,
agi, sizeof(*agi));
error = -EFSCORRUPTED;
goto out;
}
- if (next_agino == agino) {
- /*
- * We're at the head of the list. Get the inode's on-disk
- * buffer to see if there is anyone after us on the list.
- */
- error = xfs_iunlink_update_inode(tp, ip, agno, NULLAGINO,
- &next_agino);
- if (error)
- goto out;
+ /*
+ * Set our inode's next_unlinked pointer to NULL and then return
+ * the old pointer value so that we can update whatever was previous
+ * to us in the list to point to whatever was next in the list.
+ */
+ error = xfs_iunlink_update_inode(tp, ip, agno, NULLAGINO, &next_agino);
+ if (error)
+ goto out;
+ if (head_agino == agino) {
/* Point the head of the list to the next unlinked inode. */
error = xfs_iunlink_update_bucket(tp, agno, agibp, bucket_index,
next_agino);
@@ -2225,20 +2226,11 @@ xfs_iunlink_remove(
struct xfs_imap imap;
/* We need to search the list for the inode being freed. */
- error = xfs_iunlink_map_prev(tp, pag, next_agino, agino,
+ error = xfs_iunlink_map_prev(tp, pag, head_agino, agino,
&prev_ino, &imap, &last_dip, &last_ibp);
if (error)
goto out;
- /*
- * Now last_ibp points to the buffer previous to us on the
- * unlinked list. Pull us from the list.
- */
- error = xfs_iunlink_update_inode(tp, ip, agno, NULLAGINO,
- &next_agino);
- if (error)
- goto out;
-
/* Point the previous inode on the list to the next inode. */
xfs_iunlink_update_dinode(tp, agno, last_ibp, last_dip, &imap,
prev_ino, next_agino);
