diff options
-rw-r--r-- | fs/jbd/transaction.c | 5 | ||||
-rw-r--r-- | fs/jbd2/transaction.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index e1b3c8af4d17..d5c63047a8b3 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
@@ -1314,13 +1314,14 @@ int journal_stop(handle_t *handle) | |||
1314 | int old_handle_count, err; | 1314 | int old_handle_count, err; |
1315 | pid_t pid; | 1315 | pid_t pid; |
1316 | 1316 | ||
1317 | J_ASSERT(transaction->t_updates > 0); | ||
1318 | J_ASSERT(journal_current_handle() == handle); | 1317 | J_ASSERT(journal_current_handle() == handle); |
1319 | 1318 | ||
1320 | if (is_handle_aborted(handle)) | 1319 | if (is_handle_aborted(handle)) |
1321 | err = -EIO; | 1320 | err = -EIO; |
1322 | else | 1321 | else { |
1322 | J_ASSERT(transaction->t_updates > 0); | ||
1323 | err = 0; | 1323 | err = 0; |
1324 | } | ||
1324 | 1325 | ||
1325 | if (--handle->h_ref > 0) { | 1326 | if (--handle->h_ref > 0) { |
1326 | jbd_debug(4, "h_ref %d -> %d\n", handle->h_ref + 1, | 1327 | jbd_debug(4, "h_ref %d -> %d\n", handle->h_ref + 1, |
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 149957bef907..b6cf2be845a1 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c | |||
@@ -1314,13 +1314,14 @@ int jbd2_journal_stop(handle_t *handle) | |||
1314 | int old_handle_count, err; | 1314 | int old_handle_count, err; |
1315 | pid_t pid; | 1315 | pid_t pid; |
1316 | 1316 | ||
1317 | J_ASSERT(transaction->t_updates > 0); | ||
1318 | J_ASSERT(journal_current_handle() == handle); | 1317 | J_ASSERT(journal_current_handle() == handle); |
1319 | 1318 | ||
1320 | if (is_handle_aborted(handle)) | 1319 | if (is_handle_aborted(handle)) |
1321 | err = -EIO; | 1320 | err = -EIO; |
1322 | else | 1321 | else { |
1322 | J_ASSERT(transaction->t_updates > 0); | ||
1323 | err = 0; | 1323 | err = 0; |
1324 | } | ||
1324 | 1325 | ||
1325 | if (--handle->h_ref > 0) { | 1326 | if (--handle->h_ref > 0) { |
1326 | jbd_debug(4, "h_ref %d -> %d\n", handle->h_ref + 1, | 1327 | jbd_debug(4, "h_ref %d -> %d\n", handle->h_ref + 1, |