rpms/kernel/FC-3 linux-2.6.11-ext3-release-race.patch, NONE, 1.1 kernel-2.6.spec, 1.788, 1.789
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Mar 18 18:18:51 UTC 2005
Update of /cvs/dist/rpms/kernel/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv22453
Modified Files:
kernel-2.6.spec
Added Files:
linux-2.6.11-ext3-release-race.patch
Log Message:
Kjournald oops 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/FC-3/kernel-2.6.spec,v
retrieving revision 1.788
retrieving revision 1.789
diff -u -r1.788 -r1.789
--- kernel-2.6.spec 16 Mar 2005 06:41:53 -0000 1.788
+++ kernel-2.6.spec 18 Mar 2005 18:18:48 -0000 1.789
@@ -297,6 +297,7 @@
# Misc bits.
Patch1700: linux-2.6.10-revert-module-invalidparam.patch
+Patch1710: linux-2.6.11-ext3-release-race.patch
Patch1760: linux-2.6.9-module_version.patch
Patch1910: linux-2.6.9-spinlock-debug-panic.patch
@@ -582,6 +583,8 @@
# Misc fixes
# Don't barf on obsolete module parameters.
%patch1700 -p1
+# Fix kjournald oops race
+%patch1710 -p1
# Add missing MODULE_VERSION tags to some modules.
%patch1760 -p1
# Make spinlock debugging panic instead of continue.
@@ -897,6 +900,9 @@
%endif
%changelog
+* Fri Mar 18 2005 Dave Jones <davej at redhat.com>
+- Kjournald oops race. (#146344)
+
* Tue Mar 15 2005 Dave Jones <davej at redhat.com>
- Update to 2.6.11.4
More information about the fedora-cvs-commits
mailing list