Attachment 292682 Details for Bug 183119 – debug patch with potential fix.

[patch] debug patch with potential fix.

jbd-transaction-credits-debug.patch (text/plain), 2.64 KB, created by Josef Bacik on 2008-01-23 19:10:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Bacik

Created: 2008-01-23 19:10:46 UTC

Size: 2.64 KB

patch

obsolete

>diff -up linux-2.6.9/include/linux/jbd.h.josef linux-2.6.9/include/linux/jbd.h
>--- linux-2.6.9/include/linux/jbd.h.josef	2008-01-18 13:31:06.000000000 -0500
>+++ linux-2.6.9/include/linux/jbd.h	2008-01-18 13:31:32.000000000 -0500
>@@ -598,6 +598,7 @@ struct transaction_s 
> #ifndef __GENKSYMS__
> 	struct journal_head     *t_checkpoint_io_list;
> #endif
>+	unsigned long		t_ip;
> };
> 
> /**
>diff -up linux-2.6.9/fs/jbd/commit.c.josef linux-2.6.9/fs/jbd/commit.c
>--- linux-2.6.9/fs/jbd/commit.c.josef	2008-01-23 10:39:10.000000000 -0500
>+++ linux-2.6.9/fs/jbd/commit.c	2008-01-23 14:03:58.000000000 -0500
>@@ -437,13 +437,6 @@ write_out_data:
> 			continue;
> 		}
> 
>-		/*
>-		 * start_this_handle() uses t_outstanding_credits to determine
>-		 * the free space in the log, but this counter is changed
>-		 * by journal_next_log_block() also.
>-		 */
>-		commit_transaction->t_outstanding_credits--;
>-
> 		/* Bump b_count to prevent truncate from stumbling over
>                    the shadowed buffer!  @@@ This can go if we ever get
>                    rid of the BJ_IO/BJ_Shadow pairing of buffers. */
>diff -up linux-2.6.9/fs/jbd/transaction.c.josef linux-2.6.9/fs/jbd/transaction.c
>--- linux-2.6.9/fs/jbd/transaction.c.josef	2008-01-18 13:28:28.000000000 -0500
>+++ linux-2.6.9/fs/jbd/transaction.c	2008-01-23 10:41:38.000000000 -0500
>@@ -223,6 +223,9 @@ repeat_locked:
> 	transaction->t_outstanding_credits += nblocks;
> 	transaction->t_updates++;
> 	transaction->t_handle_count++;
>+
>+	J_ASSERT(transaction->t_outstanding_credits >= 0);
>+
> 	jbd_debug(4, "Handle %p given %d credits (total %d, free %d)\n",
> 		  handle, nblocks, transaction->t_outstanding_credits,
> 		  __log_space_left(journal));
>@@ -350,6 +353,7 @@ int journal_extend(handle_t *handle, int
> 
> 	handle->h_buffer_credits += nblocks;
> 	transaction->t_outstanding_credits += nblocks;
>+	J_ASSERT(transaction->t_outstanding_credits >= 0);
> 	result = 0;
> 
> 	jbd_debug(3, "extended handle %p by %d\n", handle, nblocks);
>@@ -400,6 +404,7 @@ int journal_restart(handle_t *handle, in
> 	transaction->t_outstanding_credits -= handle->h_buffer_credits;
> 	transaction->t_updates--;
> 
>+	J_ASSERT(transaction->t_outstanding_credits >= 0);
> 	if (!transaction->t_updates)
> 		wake_up(&journal->j_wait_updates);
> 	spin_unlock(&transaction->t_handle_lock);
>@@ -1379,6 +1384,9 @@ int journal_stop(handle_t *handle)
> 	spin_lock(&transaction->t_handle_lock);
> 	transaction->t_outstanding_credits -= handle->h_buffer_credits;
> 	transaction->t_updates--;
>+	J_ASSERT(transaction->t_outstanding_credits >= 0);
>+	transaction->t_ip = (unsigned long)__builtin_return_address(2);
>+
> 	if (!transaction->t_updates) {
> 		wake_up(&journal->j_wait_updates);
> 		if (journal->j_barrier_count)

Actions: View | Diff

Attachments on bug 183119: 143420 | 144402 | 291901 | 292185 | 292225 | 292398 | 292657 | 292682 | 293429 | 293746 | 293757 | 295041 | 295315 | 296621