From fcb773a64930d95ffab848f9b556e22569411183 Mon Sep 17 00:00:00 2001 From: OGAWA Hirofumi Date: Thu, 19 Oct 2006 23:29:11 -0700 Subject: [PATCH] --- yaml --- r: 40020 b: refs/heads/master c: 3e2a532b26b491706bd8b5c7cfc8d767b43b8f36 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jbd/transaction.c | 5 +++-- trunk/fs/jbd2/transaction.c | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5c6c69024720..efdc07a1bf1c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82591e6ea234762eeaa8b2337fe060ed438c18dc +refs/heads/master: 3e2a532b26b491706bd8b5c7cfc8d767b43b8f36 diff --git a/trunk/fs/jbd/transaction.c b/trunk/fs/jbd/transaction.c index e1b3c8af4d17..d5c63047a8b3 100644 --- a/trunk/fs/jbd/transaction.c +++ b/trunk/fs/jbd/transaction.c @@ -1314,13 +1314,14 @@ int journal_stop(handle_t *handle) int old_handle_count, err; pid_t pid; - J_ASSERT(transaction->t_updates > 0); J_ASSERT(journal_current_handle() == handle); if (is_handle_aborted(handle)) err = -EIO; - else + else { + J_ASSERT(transaction->t_updates > 0); err = 0; + } if (--handle->h_ref > 0) { jbd_debug(4, "h_ref %d -> %d\n", handle->h_ref + 1, diff --git a/trunk/fs/jbd2/transaction.c b/trunk/fs/jbd2/transaction.c index 149957bef907..b6cf2be845a1 100644 --- a/trunk/fs/jbd2/transaction.c +++ b/trunk/fs/jbd2/transaction.c @@ -1314,13 +1314,14 @@ int jbd2_journal_stop(handle_t *handle) int old_handle_count, err; pid_t pid; - J_ASSERT(transaction->t_updates > 0); J_ASSERT(journal_current_handle() == handle); if (is_handle_aborted(handle)) err = -EIO; - else + else { + J_ASSERT(transaction->t_updates > 0); err = 0; + } if (--handle->h_ref > 0) { jbd_debug(4, "h_ref %d -> %d\n", handle->h_ref + 1,