The following commit has been merged in the master branch:
commit 4754943e91eb79f8e221b265746b7dd2bc44516d
Author: Patrick Winnertz <win...@debian.org>
Date:   Wed Aug 12 16:16:09 2009 +0200

    Fixed applying problem on 2.6.18er kernel series, rediffed two
    patches
    
    Signed-off-by: Patrick Winnertz <win...@debian.org>

diff --git a/debian/patches/00list b/debian/patches/00list
index b428645..42d06a9 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -27,3 +27,4 @@ libcfs_wrong_includepath.dpatch
 lnet-missing-prototypes.dpatch
 version_tag-pl-path.dpatch
 fix_typecasts_in_printf.dpatch
+rediffed_2.6.18-kernel_patches.dpatch
diff --git a/debian/patches/rediffed_2.6.18-kernel_patches.dpatch 
b/debian/patches/rediffed_2.6.18-kernel_patches.dpatch
new file mode 100755
index 0000000..cb47ce4
--- /dev/null
+++ b/debian/patches/rediffed_2.6.18-kernel_patches.dpatch
@@ -0,0 +1,272 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## autogen.dpatch by Patrick Winnertz <win...@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: rediffed all 2.6.18er kernel patches as they doesn't apply on
+## DP: vanilla and debian kernels
+
+...@dpatch@
+diff --git a/lustre/kernel_patches/patches/export-2.6.18-vanilla.patch 
b/lustre/kernel_patches/patches/export-2.6.18-vanilla.patch
+index a6813e6..d725762 100644
+--- a/lustre/kernel_patches/patches/export-2.6.18-vanilla.patch
++++ b/lustre/kernel_patches/patches/export-2.6.18-vanilla.patch
+@@ -1,20 +1,8 @@
+-Index: linux-2.6/fs/open.c
++Index: linux-source-2.6.18/fs/jbd/journal.c
+ ===================================================================
+---- linux-2.6.orig/fs/open.c  2006-07-15 16:10:37.000000000 +0800
+-+++ linux-2.6/fs/open.c       2006-07-15 16:22:04.000000000 +0800
+-@@ -808,7 +808,6 @@ asmlinkage long sys_lchown(const char __
+-      return error;
+- }
+- 
+--
+- asmlinkage long sys_fchown(unsigned int fd, uid_t user, gid_t group)
+- {
+-      struct file * file;
+-Index: linux-2.6/fs/jbd/journal.c
+-===================================================================
+---- linux-2.6.orig/fs/jbd/journal.c   2006-07-15 16:13:50.000000000 +0800
+-+++ linux-2.6/fs/jbd/journal.c        2006-07-15 16:22:04.000000000 +0800
+-@@ -74,6 +74,7 @@ EXPORT_SYMBOL(journal_abort);
++--- linux-source-2.6.18.orig/fs/jbd/journal.c 2009-08-12 16:05:38.000000000 
+0200
+++++ linux-source-2.6.18/fs/jbd/journal.c      2009-08-12 16:05:59.000000000 
+0200
++@@ -74,6 +74,7 @@
+  EXPORT_SYMBOL(journal_errno);
+  EXPORT_SYMBOL(journal_ack_err);
+  EXPORT_SYMBOL(journal_clear_err);
+diff --git a/lustre/kernel_patches/patches/jbd-stats-2.6-rhel5.patch 
b/lustre/kernel_patches/patches/jbd-stats-2.6-rhel5.patch
+index e3de36f..7ec6554 100644
+--- a/lustre/kernel_patches/patches/jbd-stats-2.6-rhel5.patch
++++ b/lustre/kernel_patches/patches/jbd-stats-2.6-rhel5.patch
+@@ -1,7 +1,7 @@
+-Index: linux-2.6.18-128.1.14/include/linux/jbd.h
++Index: linux-2.6.18.8/include/linux/jbd.h
+ ===================================================================
+---- linux-2.6.18-128.1.14.orig/include/linux/jbd.h    2009-06-19 
12:33:38.000000000 -0600
+-+++ linux-2.6.18-128.1.14/include/linux/jbd.h 2009-06-19 12:34:22.000000000 
-0600
++--- linux-2.6.18.8.orig/include/linux/jbd.h   2009-08-12 16:09:53.000000000 
+0200
+++++ linux-2.6.18.8/include/linux/jbd.h        2009-08-12 16:10:14.000000000 
+0200
+ @@ -428,6 +428,16 @@
+  };
+  
+@@ -116,10 +116,10 @@ Index: linux-2.6.18-128.1.14/include/linux/jbd.h
+        * An opaque pointer to fs-private information.  ext3 puts its
+        * superblock pointer here
+        */
+-Index: linux-2.6.18-128.1.14/fs/jbd/transaction.c
++Index: linux-2.6.18.8/fs/jbd/transaction.c
+ ===================================================================
+---- linux-2.6.18-128.1.14.orig/fs/jbd/transaction.c   2009-06-19 
12:33:38.000000000 -0600
+-+++ linux-2.6.18-128.1.14/fs/jbd/transaction.c        2009-06-19 
12:34:22.000000000 -0600
++--- linux-2.6.18.8.orig/fs/jbd/transaction.c  2009-08-12 16:09:53.000000000 
+0200
+++++ linux-2.6.18.8/fs/jbd/transaction.c       2009-08-12 16:10:14.000000000 
+0200
+ @@ -60,6 +60,8 @@
+  
+       J_ASSERT(journal->j_running_transaction == NULL);
+@@ -150,10 +150,10 @@ Index: linux-2.6.18-128.1.14/fs/jbd/transaction.c
+       handle->h_transaction = transaction;
+       transaction->t_outstanding_credits += nblocks;
+       transaction->t_updates++;
+-Index: linux-2.6.18-128.1.14/fs/jbd/journal.c
++Index: linux-2.6.18.8/fs/jbd/journal.c
+ ===================================================================
+---- linux-2.6.18-128.1.14.orig/fs/jbd/journal.c       2009-06-19 
12:33:58.000000000 -0600
+-+++ linux-2.6.18-128.1.14/fs/jbd/journal.c    2009-06-19 12:34:22.000000000 
-0600
++--- linux-2.6.18.8.orig/fs/jbd/journal.c      2009-08-12 16:09:53.000000000 
+0200
+++++ linux-2.6.18.8/fs/jbd/journal.c   2009-08-12 16:10:14.000000000 +0200
+ @@ -36,6 +36,7 @@
+  #include <linux/kthread.h>
+  #include <linux/poison.h>
+@@ -489,7 +489,7 @@ Index: linux-2.6.18-128.1.14/fs/jbd/journal.c
+  
+       /* journal descriptor can store up to n blocks -bzzz */
+       n = journal->j_blocksize / sizeof(journal_block_tag_t);
+-@@ -1168,6 +1468,8 @@
++@@ -1160,6 +1460,8 @@
+               brelse(journal->j_sb_buffer);
+       }
+  
+@@ -498,7 +498,7 @@ Index: linux-2.6.18-128.1.14/fs/jbd/journal.c
+       if (journal->j_inode)
+               iput(journal->j_inode);
+       if (journal->j_revoke)
+-@@ -2015,6 +2317,28 @@
++@@ -1999,6 +2301,28 @@
+  
+  #endif
+  
+@@ -527,7 +527,7 @@ Index: linux-2.6.18-128.1.14/fs/jbd/journal.c
+  kmem_cache_t *jbd_handle_cache;
+  
+  static int __init journal_init_handle_cache(void)
+-@@ -2078,6 +2402,7 @@
++@@ -2062,6 +2386,7 @@
+       if (ret != 0)
+               journal_destroy_caches();
+       create_jbd_proc_entry();
+@@ -535,7 +535,7 @@ Index: linux-2.6.18-128.1.14/fs/jbd/journal.c
+       return ret;
+  }
+  
+-@@ -2089,6 +2414,7 @@
++@@ -2073,6 +2398,7 @@
+               printk(KERN_EMERG "JBD: leaked %d journal_heads!\n", n);
+  #endif
+       remove_jbd_proc_entry();
+@@ -543,11 +543,11 @@ Index: linux-2.6.18-128.1.14/fs/jbd/journal.c
+       journal_destroy_caches();
+  }
+  
+-Index: linux-2.6.18-128.1.14/fs/jbd/checkpoint.c
++Index: linux-2.6.18.8/fs/jbd/checkpoint.c
+ ===================================================================
+---- linux-2.6.18-128.1.14.orig/fs/jbd/checkpoint.c    2009-06-19 
12:33:38.000000000 -0600
+-+++ linux-2.6.18-128.1.14/fs/jbd/checkpoint.c 2009-06-19 12:34:22.000000000 
-0600
+-@@ -242,7 +242,7 @@
++--- linux-2.6.18.8.orig/fs/jbd/checkpoint.c   2009-08-12 16:09:53.000000000 
+0200
+++++ linux-2.6.18.8/fs/jbd/checkpoint.c        2009-08-12 16:11:20.000000000 
+0200
++@@ -231,7 +231,7 @@
+   * Called under jbd_lock_bh_state(jh2bh(jh)), and drops it
+   */
+  static int __process_buffer(journal_t *journal, struct journal_head *jh,
+@@ -556,7 +556,7 @@ Index: linux-2.6.18-128.1.14/fs/jbd/checkpoint.c
+  {
+       struct buffer_head *bh = jh2bh(jh);
+       int ret = 0;
+-@@ -260,6 +260,7 @@
++@@ -249,6 +249,7 @@
+               transaction_t *t = jh->b_transaction;
+               tid_t tid = t->t_tid;
+  
+@@ -564,7 +564,7 @@ Index: linux-2.6.18-128.1.14/fs/jbd/checkpoint.c
+               spin_unlock(&journal->j_list_lock);
+               jbd_unlock_bh_state(bh);
+               log_start_commit(journal, tid);
+-@@ -291,6 +292,7 @@
++@@ -278,6 +279,7 @@
+               bhs[*batch_count] = bh;
+               __buffer_relink_io(jh);
+               jbd_unlock_bh_state(bh);
+@@ -572,7 +572,7 @@ Index: linux-2.6.18-128.1.14/fs/jbd/checkpoint.c
+               (*batch_count)++;
+               if (*batch_count == NR_BATCH) {
+                       spin_unlock(&journal->j_list_lock);
+-@@ -336,6 +338,8 @@
++@@ -321,6 +323,8 @@
+       if (!journal->j_checkpoint_transactions)
+               goto out;
+       transaction = journal->j_checkpoint_transactions;
+@@ -581,17 +581,16 @@ Index: linux-2.6.18-128.1.14/fs/jbd/checkpoint.c
+       this_tid = transaction->t_tid;
+  restart:
+       /*
+-@@ -360,7 +364,8 @@
++@@ -345,7 +349,7 @@
+                               retry = 1;
+                               break;
+                       }
+ -                     retry = __process_buffer(journal, jh, bhs,&batch_count);
+-+                     retry = __process_buffer(journal, jh, bhs,&batch_count,
+-+                                              transaction);
+-                      if (retry < 0 && !result)
+-                              result = retry;
+++                     retry = __process_buffer(journal, jh, bhs,&batch_count, 
transaction);
+                       if (!retry && lock_need_resched(&journal->j_list_lock)){
+-@@ -692,6 +697,8 @@
++                              spin_unlock(&journal->j_list_lock);
++                              retry = 1;
++@@ -667,6 +671,8 @@
+  
+  void __journal_drop_transaction(journal_t *journal, transaction_t 
*transaction)
+  {
+@@ -600,7 +599,7 @@ Index: linux-2.6.18-128.1.14/fs/jbd/checkpoint.c
+       assert_spin_locked(&journal->j_list_lock);
+       if (transaction->t_cpnext) {
+               transaction->t_cpnext->t_cpprev = transaction->t_cpprev;
+-@@ -718,5 +725,25 @@
++@@ -693,5 +699,25 @@
+       J_ASSERT(journal->j_running_transaction != transaction);
+  
+       jbd_debug(1, "Dropping transaction %d, all done\n", transaction->t_tid);
+@@ -626,10 +625,10 @@ Index: linux-2.6.18-128.1.14/fs/jbd/checkpoint.c
+ +
+       kfree(transaction);
+  }
+-Index: linux-2.6.18-128.1.14/fs/jbd/commit.c
++Index: linux-2.6.18.8/fs/jbd/commit.c
+ ===================================================================
+---- linux-2.6.18-128.1.14.orig/fs/jbd/commit.c        2009-06-19 
12:33:38.000000000 -0600
+-+++ linux-2.6.18-128.1.14/fs/jbd/commit.c     2009-06-19 12:34:22.000000000 
-0600
++--- linux-2.6.18.8.orig/fs/jbd/commit.c       2009-08-12 16:09:53.000000000 
+0200
+++++ linux-2.6.18.8/fs/jbd/commit.c    2009-08-12 16:10:14.000000000 +0200
+ @@ -13,6 +13,7 @@
+   * part of the ext2fs journaling system.
+   */
+@@ -646,7 +645,7 @@ Index: linux-2.6.18-128.1.14/fs/jbd/commit.c
+  /*
+   * Default IO end handler for temporary BJ_IO buffer_heads.
+   */
+-@@ -288,6 +290,7 @@
++@@ -279,6 +281,7 @@
+   */
+  void journal_commit_transaction(journal_t *journal)
+  {
+@@ -654,7 +653,7 @@ Index: linux-2.6.18-128.1.14/fs/jbd/commit.c
+       transaction_t *commit_transaction;
+       struct journal_head *jh, *new_jh, *descriptor;
+       struct buffer_head **wbuf = journal->j_wbuf;
+-@@ -334,6 +337,11 @@
++@@ -325,6 +328,11 @@
+       spin_lock(&journal->j_state_lock);
+       commit_transaction->t_state = T_LOCKED;
+  
+@@ -666,7 +665,7 @@ Index: linux-2.6.18-128.1.14/fs/jbd/commit.c
+       spin_lock(&commit_transaction->t_handle_lock);
+       while (commit_transaction->t_updates) {
+               DEFINE_WAIT(wait);
+-@@ -404,6 +412,9 @@
++@@ -395,6 +403,9 @@
+        */
+       journal_switch_revoke_table(journal);
+  
+@@ -676,9 +675,9 @@ Index: linux-2.6.18-128.1.14/fs/jbd/commit.c
+       commit_transaction->t_state = T_FLUSH;
+       journal->j_committing_transaction = commit_transaction;
+       journal->j_running_transaction = NULL;
+-@@ -484,6 +495,11 @@
+-      J_ASSERT(commit_transaction->t_nr_buffers <=
+-               commit_transaction->t_outstanding_credits);
++@@ -486,6 +497,11 @@
++       */
++      commit_transaction->t_state = T_COMMIT;
+  
+ +     stats.ts_logging = CURRENT_MSECS;
+ +     stats.ts_flushing = jbd_time_diff(stats.ts_flushing, stats.ts_logging);
+@@ -688,7 +687,7 @@ Index: linux-2.6.18-128.1.14/fs/jbd/commit.c
+       descriptor = NULL;
+       bufs = 0;
+       while (commit_transaction->t_buffers) {
+-@@ -633,6 +649,7 @@
++@@ -634,6 +650,7 @@
+                               submit_bh(WRITE, bh);
+                       }
+                       cond_resched();
+@@ -696,7 +695,7 @@ Index: linux-2.6.18-128.1.14/fs/jbd/commit.c
+  
+                       /* Force a new descriptor to be generated next
+                             time round the loop. */
+-@@ -830,6 +847,7 @@
++@@ -828,6 +845,7 @@
+               cp_transaction = jh->b_cp_transaction;
+               if (cp_transaction) {
+                       JBUFFER_TRACE(jh, "remove from old cp transaction");
+@@ -704,7 +703,7 @@ Index: linux-2.6.18-128.1.14/fs/jbd/commit.c
+                       __journal_remove_checkpoint(jh);
+               }
+  
+-@@ -906,6 +924,36 @@
++@@ -902,6 +920,36 @@
+  
+       J_ASSERT(commit_transaction->t_state == T_COMMIT);
+  

-- 
Lustre Debian Packaging 

_______________________________________________
Pkg-lustre-svn-commit mailing list
Pkg-lustre-svn-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit

Reply via email to