summaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorDavid Chinner <dgc@sgi.com>2007-11-23 16:28:17 +1100
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2008-02-07 18:15:29 +1100
commit8ae2c0f64a81a93d2c394eacee29d6ced53b54f9 (patch)
tree6a28f5609daaaa7e8b069323c9a19e9cd87772c4 /fs/xfs
parenta8272ce0c1d49aa3bec57682678f0bdfe28ed4ca (diff)
downloadop-kernel-dev-8ae2c0f64a81a93d2c394eacee29d6ced53b54f9.zip
op-kernel-dev-8ae2c0f64a81a93d2c394eacee29d6ced53b54f9.tar.gz
[XFS] Fix sparse warning in xlog_recover_do_efd_trans.
Sparse trips over the locking order in xlog_recover_do_efd_trans() when xfs_trans_delete_ail() drops the ail lock. Because the unlock is conditional, we need to either annotate with a "fake unlock" or change the structure of the code so sparse thinks the function always unlocks. Reordering the code makes it simpler, so do that. SGI-PV: 972755 SGI-Modid: xfs-linux-melb:xfs-kern:30003a Signed-off-by: David Chinner <dgc@sgi.com> Signed-off-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_log_recover.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 3b804b9..0716729 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -2733,21 +2733,13 @@ xlog_recover_do_efd_trans(
* AIL lock.
*/
xfs_trans_delete_ail(mp, lip);
- break;
+ xfs_efi_item_free(efip);
+ return;
}
}
lip = xfs_trans_next_ail(mp, lip, &gen, NULL);
}
-
- /*
- * If we found it, then free it up. If it wasn't there, it
- * must have been overwritten in the log. Oh well.
- */
- if (lip != NULL) {
- xfs_efi_item_free(efip);
- } else {
- spin_unlock(&mp->m_ail_lock);
- }
+ spin_unlock(&mp->m_ail_lock);
}
/*
OpenPOWER on IntegriCloud