Attachment 306266 Details for Bug 439193 – patch for this bz.

[patch] patch for this bz.

jbd-fix-journal-overflow-rhel5.patch (text/plain), 3.60 KB, created by Josef Bacik on 2008-05-21 15:29:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Bacik

Created: 2008-05-21 15:29:33 UTC

Size: 3.60 KB

patch

obsolete

>Index: kernel/fs/jbd/commit.c
>===================================================================
>--- kernel.orig/fs/jbd/commit.c
>+++ kernel/fs/jbd/commit.c
>@@ -409,22 +409,6 @@ void journal_commit_transaction(journal_
> 	jbd_debug (3, "JBD: commit phase 2\n");
> 
> 	/*
>-	 * First, drop modified flag: all accesses to the buffers
>-	 * will be tracked for a new trasaction only -bzzz
>-	 */
>-	spin_lock(&journal->j_list_lock);
>-	if (commit_transaction->t_buffers) {
>-		new_jh = jh = commit_transaction->t_buffers->b_tnext;
>-		do {
>-			J_ASSERT_JH(new_jh, new_jh->b_modified == 1 ||
>-					new_jh->b_modified == 0);
>-			new_jh->b_modified = 0;
>-			new_jh = new_jh->b_tnext;
>-		} while (new_jh != jh);
>-	}
>-	spin_unlock(&journal->j_list_lock);
>-
>-	/*
> 	 * Now start flushing things to disk, in the order they appear
> 	 * on the transaction lists.  Data blocks go first.
> 	 */
>@@ -490,6 +474,9 @@ void journal_commit_transaction(journal_
> 	 */
> 	commit_transaction->t_state = T_COMMIT;
> 
>+	J_ASSERT(commit_transaction->t_nr_buffers <=
>+		 commit_transaction->t_outstanding_credits);
>+
> 	descriptor = NULL;
> 	bufs = 0;
> 	while (commit_transaction->t_buffers) {
>Index: kernel/fs/jbd/transaction.c
>===================================================================
>--- kernel.orig/fs/jbd/transaction.c
>+++ kernel/fs/jbd/transaction.c
>@@ -600,6 +600,12 @@ repeat:
> 		goto done;
> 
> 	/*
>+	 * this is the first time this transaction is touching this buffer,
>+	 * reset the modified flag
>+	 */
>+	jh->b_modified = 0;
>+
>+	/*
> 	 * If there is already a copy-out version of this buffer, then we don't
> 	 * need to make another one
> 	 */
>@@ -811,9 +817,16 @@ int journal_get_create_access(handle_t *
> 
> 	if (jh->b_transaction == NULL) {
> 		jh->b_transaction = transaction;
>+
>+		/* first access by this transaction */
>+		jh->b_modified = 0;
>+
> 		JBUFFER_TRACE(jh, "file as BJ_Reserved");
> 		__journal_file_buffer(jh, transaction, BJ_Reserved);
> 	} else if (jh->b_transaction == journal->j_committing_transaction) {
>+		/* first access by this transaction */
>+		jh->b_modified = 0;
>+
> 		JBUFFER_TRACE(jh, "set next transaction");
> 		jh->b_next_transaction = transaction;
> 	}
>@@ -1212,6 +1225,7 @@ int journal_forget (handle_t *handle, st
> 	struct journal_head *jh;
> 	int drop_reserve = 0;
> 	int err = 0;
>+	int was_modified = 0;
> 
> 	BUFFER_TRACE(bh, "entry");
> 
>@@ -1230,6 +1244,9 @@ int journal_forget (handle_t *handle, st
> 		goto not_jbd;
> 	}
> 
>+	/* keep track of wether or not this transaction modified us */
>+	was_modified = jh->b_modified;
>+
> 	/*
> 	 * The buffer's going from the transaction, we must drop
> 	 * all references -bzzz
>@@ -1247,7 +1264,12 @@ int journal_forget (handle_t *handle, st
> 
> 		JBUFFER_TRACE(jh, "belongs to current transaction: unfile");
> 
>-		drop_reserve = 1;
>+		/*
>+		 * we only want to drop a reference if this transaction
>+		 * modified the buffer
>+		 */
>+		if (was_modified)
>+			drop_reserve = 1;
> 
> 		/* 
> 		 * We are no longer going to journal this buffer.
>@@ -1287,7 +1309,13 @@ 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;
>+
>+			/*
>+			 * only drop a reference if this transaction modified
>+			 * the buffer
>+			 */
>+			if (was_modified)
>+				drop_reserve = 1;
> 		}
> 	}
> 
>@@ -2056,7 +2084,7 @@ void __journal_refile_buffer(struct jour
> 	jh->b_transaction = jh->b_next_transaction;
> 	jh->b_next_transaction = NULL;
> 	__journal_file_buffer(jh, jh->b_transaction,
>-				was_dirty ? BJ_Metadata : BJ_Reserved);
>+				jh->b_modified ? BJ_Metadata : BJ_Reserved);
> 	J_ASSERT_JH(jh, jh->b_transaction->t_state == T_RUNNING);
> 
> 	if (was_dirty)

Actions: View | Diff

Attachments on bug 439193: 306266