Attachment 293757 Details for Bug 183119 – final version of the patch that actually compiles.

[patch] final version of the patch that actually compiles.

jbd-fix-free-space-accounting-rhel4.patch (text/plain), 1.23 KB, created by Josef Bacik on 2008-02-01 18:56:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Bacik

Created: 2008-02-01 18:56:22 UTC

Size: 1.23 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-02-01 13:49:25.000000000 -0500
>@@ -1089,8 +1089,7 @@ static inline int jbd_space_needed(journ
> {
> 	int nblocks = journal->j_max_transaction_buffers;
> 	if (journal->j_committing_transaction)
>-		nblocks += journal->j_committing_transaction->
>-					t_outstanding_credits;
>+		nblocks += journal->j_committing_transaction->t_nr_buffers;
> 	return nblocks;
> }
> 
>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-02-01 11:21:56.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. */

Actions: View | Diff

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