[Pkg-lustre-svn-commit] r354 - in /trunk/debian: changelog patches/00list patches/bug13438-fix-mballoc-bogus-BUGON.dpatch patches/bug13614-kludge-stop-resend.dpatch
pwinnertz-guest at users.alioth.debian.org
pwinnertz-guest at users.alioth.debian.org
Wed Oct 10 12:14:08 UTC 2007
Author: pwinnertz-guest
Date: Wed Oct 10 12:14:08 2007
New Revision: 354
URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=354
Log:
Added two suggested patches
Added:
trunk/debian/patches/bug13438-fix-mballoc-bogus-BUGON.dpatch
trunk/debian/patches/bug13614-kludge-stop-resend.dpatch
Modified:
trunk/debian/changelog
trunk/debian/patches/00list
Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/changelog?rev=354&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Wed Oct 10 12:14:08 2007
@@ -3,8 +3,10 @@
[ Patrick Winnertz ]
* Added klugde from Niklas again, in order to install the modules into
the right directory.
+ * Added patches for bug 13438 & 13614 (from upstream bugzilla) to
+ debian/patches.
- -- Patrick Winnertz <patrick.winnertz at skolelinux.org> Wed, 10 Oct 2007 12:11:48 +0200
+ -- Patrick Winnertz <patrick.winnertz at skolelinux.org> Wed, 10 Oct 2007 14:13:54 +0200
lustre (1.6.2-3) unstable; urgency=low
Modified: trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/00list?rev=354&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Wed Oct 10 12:14:08 2007
@@ -23,6 +23,8 @@
bug13030-fix-nfs-export-norootsquash.dpatch
bug12052-fix-loopin_lsm_lmm_verify_common.dpatch
bug12627-fix-lfs-listnotonlyfiles.dpatch
+bug13438-fix-mballoc-bogus-BUGON.dpatch
+bug13614-kludge-stop-resend.dpatch
# Debian patches
autogen-run.dpatch
Added: trunk/debian/patches/bug13438-fix-mballoc-bogus-BUGON.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/bug13438-fix-mballoc-bogus-BUGON.dpatch?rev=354&op=file
==============================================================================
--- trunk/debian/patches/bug13438-fix-mballoc-bogus-BUGON.dpatch (added)
+++ trunk/debian/patches/bug13438-fix-mballoc-bogus-BUGON.dpatch Wed Oct 10 12:14:08 2007
@@ -1,0 +1,47 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: CFS bug 13438 - mballoc bogus BUG_ON
+
+ at DPATCH@
+diff -p -u -r1.1.4.2 ext3-mballoc3-core.patch
+--- ./ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch 30 Aug 2007 03:57:03 -0000 1.1.4.2
++++ ./ldiskfs/kernel_patches/patches/ext3-mballoc3-core.patch 14 Sep 2007 07:56:13 -0000
+@@ -183,7 +183,7 @@ Index: linux-2.6.9-full/fs/ext3/mballoc.
+ ===================================================================
+ --- linux-2.6.9-full.orig/fs/ext3/mballoc.c 2007-07-14 04:24:39.138985848 +0400
+ +++ linux-2.6.9-full/fs/ext3/mballoc.c 2007-07-20 11:31:03.000000000 +0400
+-@@ -0,0 +1,4391 @@
++@@ -0,0 +1,4393 @@
+ +/*
+ + * Copyright (c) 2003-2006, Cluster File Systems, Inc, info at clusterfs.com
+ + * Written by Alex Tomas <alex at clusterfs.com>
+@@ -3515,7 +3515,9 @@ Index: linux-2.6.9-full/fs/ext3/mballoc.
+ + ext3_get_group_no_and_offset(sb, pa->pa_pstart, &groupnr, &start);
+ + len = pa->pa_len;
+ + spin_unlock(&pa->pa_lock);
+-+ BUG_ON(groupnr != group);
+++ if (unlikely(len == 0))
+++ continue;
+++ BUG_ON(groupnr != group && len != 0);
+ + mb_set_bits(bitmap, start, len);
+ + preallocated += len;
+ + count++;
+@@ -3762,7 +3764,7 @@ Index: linux-2.6.9-full/fs/ext3/mballoc.
+ +
+ + BUG_ON(pa->pa_deleted == 0);
+ + ext3_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
+-+ BUG_ON(group != e3b->bd_group);
+++ BUG_ON(group != e3b->bd_group && pa->pa_len != 0);
+ + end = bit + pa->pa_len;
+ +
+ + ac.ac_sb = sb;
+@@ -3816,7 +3818,7 @@ Index: linux-2.6.9-full/fs/ext3/mballoc.
+ +
+ + BUG_ON(pa->pa_deleted == 0);
+ + ext3_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
+-+ BUG_ON(group != e3b->bd_group);
+++ BUG_ON(group != e3b->bd_group && pa->pa_len != 0);
+ + mb_free_blocks(pa->pa_inode, e3b, bit, pa->pa_len);
+ + atomic_add(pa->pa_len, &EXT3_SB(sb)->s_mb_discarded);
+ +
Added: trunk/debian/patches/bug13614-kludge-stop-resend.dpatch
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/bug13614-kludge-stop-resend.dpatch?rev=354&op=file
==============================================================================
--- trunk/debian/patches/bug13614-kludge-stop-resend.dpatch (added)
+++ trunk/debian/patches/bug13614-kludge-stop-resend.dpatch Wed Oct 10 12:14:08 2007
@@ -1,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: CFS bug 13614 - Reduce problem by stopping resend.
+
+ at DPATCH@
+diff -u -p -r1.189.34.11 ldlm_lockd.c
+--- ./lustre/ldlm/ldlm_lockd.c 16 Aug 2007 01:22:37 -0000 1.189.34.11
++++ ./lustre/ldlm/ldlm_lockd.c 12 Sep 2007 01:35:58 -0000
+@@ -566,6 +566,7 @@ int ldlm_server_blocking_ast(struct ldlm
+ req->rq_async_args.pointer_arg[0] = arg;
+ req->rq_async_args.pointer_arg[1] = lock;
+ req->rq_interpret_reply = ldlm_cb_interpret;
++ req->rq_no_resend = 1;
+
+ lock_res(lock->l_resource);
+ if (lock->l_granted_mode != lock->l_req_mode) {
+@@ -664,6 +665,7 @@ int ldlm_server_completion_ast(struct ld
+ req->rq_async_args.pointer_arg[0] = arg;
+ req->rq_async_args.pointer_arg[1] = lock;
+ req->rq_interpret_reply = ldlm_cb_interpret;
++ req->rq_no_resend = 1;
+
+ body = lustre_msg_buf(req->rq_reqmsg, DLM_LOCKREQ_OFF, sizeof(*body));
+ body->lock_handle[0] = lock->l_remote_handle;
More information about the Pkg-lustre-svn-commit
mailing list