rpms/kernel/devel linux-2.6.11-ext3-release-race.patch, NONE, 1.1 kernel-2.6.spec, 1.1185, 1.1186

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1077

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6.11-ext3-release-race.patch 
Log Message:
kjournald release race. (#146344)



linux-2.6.11-ext3-release-race.patch:
 transaction.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6.11-ext3-release-race.patch ---
--- linux-2.6.9/fs/jbd/transaction.c.=K0002=.orig
+++ linux-2.6.9/fs/jbd/transaction.c
@@ -1812,10 +1812,10 @@ static int journal_unmap_buffer(journal_
 			JBUFFER_TRACE(jh, "checkpointed: add to BJ_Forget");
 			ret = __dispose_buffer(jh,
 					journal->j_running_transaction);
+			journal_put_journal_head(jh);
 			spin_unlock(&journal->j_list_lock);
 			jbd_unlock_bh_state(bh);
 			spin_unlock(&journal->j_state_lock);
-			journal_put_journal_head(jh);
 			return ret;
 		} else {
 			/* There is no currently-running transaction. So the
@@ -1826,10 +1826,10 @@ static int journal_unmap_buffer(journal_
 				JBUFFER_TRACE(jh, "give to committing trans");
 				ret = __dispose_buffer(jh,
 					journal->j_committing_transaction);
+				journal_put_journal_head(jh);
 				spin_unlock(&journal->j_list_lock);
 				jbd_unlock_bh_state(bh);
 				spin_unlock(&journal->j_state_lock);
-				journal_put_journal_head(jh);
 				return ret;
 			} else {
 				/* The orphan record's transaction has
@@ -1850,10 +1850,10 @@ static int journal_unmap_buffer(journal_
 					journal->j_running_transaction);
 			jh->b_next_transaction = NULL;
 		}
+		journal_put_journal_head(jh);
 		spin_unlock(&journal->j_list_lock);
 		jbd_unlock_bh_state(bh);
 		spin_unlock(&journal->j_state_lock);
-		journal_put_journal_head(jh);
 		return 0;
 	} else {
 		/* Good, the buffer belongs to the running transaction.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1185
retrieving revision 1.1186
diff -u -r1.1185 -r1.1186
--- kernel-2.6.spec	17 Mar 2005 14:59:57 -0000	1.1185
+++ kernel-2.6.spec	18 Mar 2005 18:25:23 -0000	1.1186
@@ -315,6 +315,7 @@
 Patch1710: linux-2.6.11-selinux-execute-perm-checking.patch
 Patch1720: linux-2.6.9-module_version.patch
 Patch1730: linux-2.6.9-spinlock-debug-panic.patch
+Patch1740: linux-2.6.11-ext3-release-race.patch
 
 Patch2000: linux-2.6.11-vm-taint.patch
 Patch2001: linux-2.6.9-vm-oomkiller-debugging.patch
@@ -691,6 +692,8 @@
 %patch1720 -p1
 # Make spinlock debugging panic instead of continue.
 %patch1730 -p1
+# kjournald release race
+%patch1740 -p1
 
 #
 # VM related fixes.
@@ -1098,6 +1101,9 @@
 %endif
 
 %changelog
+* Fri Mar 18 2005 Dave Jones <davej at redhat.com>
+- kjournald release race. (#146344)
+
 * Thu Mar 17 2005 Rik van Riel <riel at redhat.com>
 - upgrade to latest upstream Xen code