Attachment 295041 Details for Bug 183119 – next attempt at a fix

[patch] next attempt at a fix

jbd-release-fix.patch (text/plain), 1.49 KB, created by Josef Bacik on 2008-02-15 21:47:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Bacik

Created: 2008-02-15 21:47:07 UTC

Size: 1.49 KB

patch

obsolete

>--- linux-2.6.9/fs/jbd/transaction.c.josef	2008-02-15 15:01:00.000000000 -0500
>+++ linux-2.6.9/fs/jbd/transaction.c	2008-02-15 17:50:37.000000000 -0500
>@@ -1186,7 +1186,6 @@ void
> journal_release_buffer(handle_t *handle, struct buffer_head *bh, int credits)
> {
> 	BUFFER_TRACE(bh, "entry");
>-	handle->h_buffer_credits += credits;
> }
> 
> /** 
>@@ -1212,6 +1211,7 @@ int journal_forget (handle_t *handle, st
> 	journal_t *journal = transaction->t_journal;
> 	struct journal_head *jh;
> 	int err = 0;
>+	int drop_reserve = 0;
> 	
> 	BUFFER_TRACE(bh, "entry");
> 
>@@ -1241,6 +1241,7 @@ int journal_forget (handle_t *handle, st
> 
> 		JBUFFER_TRACE(jh, "belongs to current transaction: unfile");
> 
>+		drop_reserve = 1;
> 		/* 
> 		 * We are no longer going to journal this buffer.
> 		 * However, the commit of this transaction is still
>@@ -1264,7 +1265,7 @@ int journal_forget (handle_t *handle, st
> 				spin_unlock(&journal->j_list_lock);
> 				jbd_unlock_bh_state(bh);
> 				__bforget(bh);
>-				return 0;
>+				goto drop;
> 			}
> 		}
> 	} else if (jh->b_transaction) {
>@@ -1279,6 +1280,7 @@ int journal_forget (handle_t *handle, st
> 		if (jh->b_next_transaction) {
> 			J_ASSERT(jh->b_next_transaction == transaction);
> 			jh->b_next_transaction = NULL;
>+			drop_reserve = 1;
> 		}
> 	}
> 
>@@ -1286,6 +1288,13 @@ not_jbd:
> 	spin_unlock(&journal->j_list_lock);
> 	jbd_unlock_bh_state(bh);
> 	__brelse(bh);
>+
>+drop:
>+	if (drop_reserve) {
>+		/* no need to reserve log space for this block -bzzz */
>+		handle->h_buffer_credits++;
>+	}
>+
> 	return err;
> }
>

Actions: View | Diff

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