Skip to content

Commit

Permalink
[XFS] Fix sparse warning in xlog_recover_do_efd_trans.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Chinner authored and Lachlan McIlroy committed Feb 7, 2008
1 parent a8272ce commit 8ae2c0f
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions fs/xfs/xfs_log_recover.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand Down

0 comments on commit 8ae2c0f

Please sign in to comment.