From a0b6dddb3085bdb6db1e9aedabdc7104afcab8b6 Mon Sep 17 00:00:00 2001 From: David Chinner Date: Fri, 23 Nov 2007 16:28:17 +1100 Subject: [PATCH] --- yaml --- r: 84468 b: refs/heads/master c: 8ae2c0f64a81a93d2c394eacee29d6ced53b54f9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/xfs/xfs_log_recover.c | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index fb21d9827184..a0000e20d642 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8272ce0c1d49aa3bec57682678f0bdfe28ed4ca +refs/heads/master: 8ae2c0f64a81a93d2c394eacee29d6ced53b54f9 diff --git a/trunk/fs/xfs/xfs_log_recover.c b/trunk/fs/xfs/xfs_log_recover.c index 3b804b93b282..071672969421 100644 --- a/trunk/fs/xfs/xfs_log_recover.c +++ b/trunk/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); } /*