The following commit has been merged in the master branch:
commit 1e60fc0afd79bdd5b70fd564192d375aa67ed031
Author: Patrick Winnertz <win...@debian.org>
Date:   Fri Oct 9 11:50:57 2009 +0200

    Backporting some patches to 2.6.26-vanilla kernel
    
    Signed-off-by: Patrick Winnertz <win...@debian.org>

diff --git a/lustre/kernel_patches/patches/export-2.6.26-vanilla.patch 
b/lustre/kernel_patches/patches/export-2.6.26-vanilla.patch
new file mode 100644
index 0000000..42c68c1
--- /dev/null
+++ b/lustre/kernel_patches/patches/export-2.6.26-vanilla.patch
@@ -0,0 +1,37 @@
+Index: linux-source-2.6.26/fs/jbd2/journal.c
+===================================================================
+--- linux-source-2.6.26.orig/fs/jbd2/journal.c 2009-10-09 13:49:43.000000000 
+0200
++++ linux-source-2.6.26/fs/jbd2/journal.c      2009-10-09 13:49:50.000000000 
+0200
+@@ -460,6 +460,7 @@
+       spin_unlock(&journal->j_state_lock);
+       return ret;
+ }
++EXPORT_SYMBOL(jbd2_log_start_commit);
+ 
+ /*
+  * Force and wait upon a commit if the calling process is not within
+Index: linux-source-2.6.26/kernel/sys.c
+===================================================================
+--- linux-source-2.6.26.orig/kernel/sys.c      2009-10-09 13:49:43.000000000 
+0200
++++ linux-source-2.6.26/kernel/sys.c   2009-10-09 13:49:50.000000000 +0200
+@@ -1346,6 +1346,8 @@
+ 
+ EXPORT_SYMBOL(uts_sem);
+ 
++EXPORT_SYMBOL(uts_sem);
++
+ SYSCALL_DEFINE1(newuname, struct new_utsname __user *, name)
+ {
+       int errno = 0;
+Index: linux-source-2.6.26/security/security.c
+===================================================================
+--- linux-source-2.6.26.orig/security/security.c       2009-10-09 
13:49:43.000000000 +0200
++++ linux-source-2.6.26/security/security.c    2009-10-09 13:49:50.000000000 
+0200
+@@ -68,6 +68,7 @@
+ 
+       return 0;
+ }
++EXPORT_SYMBOL(security_inode_unlink);
+ 
+ /* Save user chosen LSM */
+ static int __init choose_lsm(char *str)
diff --git a/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch 
b/lustre/kernel_patches/patches/jbd2-jcberr-2.6.26-vanilla.patch
similarity index 76%
copy from lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch
copy to lustre/kernel_patches/patches/jbd2-jcberr-2.6.26-vanilla.patch
index 476e06f..c4a4921 100644
--- a/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch
+++ b/lustre/kernel_patches/patches/jbd2-jcberr-2.6.26-vanilla.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.18-128.1.6/include/linux/jbd2.h
+Index: linux-source-2.6.26/include/linux/jbd2.h
 ===================================================================
---- linux-2.6.18-128.1.6.orig/include/linux/jbd2.h     2009-04-15 
08:35:28.000000000 +0530
-+++ linux-2.6.18-128.1.6/include/linux/jbd2.h  2009-05-28 15:10:18.000000000 
+0530
-@@ -381,6 +381,27 @@
+--- linux-source-2.6.26.orig/include/linux/jbd2.h      2008-07-13 
23:51:29.000000000 +0200
++++ linux-source-2.6.26/include/linux/jbd2.h   2009-10-09 13:42:21.000000000 
+0200
+@@ -379,6 +379,27 @@
        bit_spin_unlock(BH_JournalHead, &bh->b_state);
  }
  
@@ -30,7 +30,7 @@ Index: linux-2.6.18-128.1.6/include/linux/jbd2.h
  struct jbd2_revoke_table_s;
  
  /**
-@@ -389,6 +410,7 @@
+@@ -387,6 +408,7 @@
   * @h_transaction: Which compound transaction is this update a part of?
   * @h_buffer_credits: Number of remaining buffers we are allowed to dirty.
   * @h_ref: Reference count on this handle
@@ -38,7 +38,7 @@ Index: linux-2.6.18-128.1.6/include/linux/jbd2.h
   * @h_err: Field for caller's use to track errors through large fs operations
   * @h_sync: flag for sync-on-close
   * @h_jdata: flag to force data journaling
-@@ -414,6 +436,13 @@
+@@ -412,6 +434,13 @@
        /* operations */
        int                     h_err;
  
@@ -52,7 +52,7 @@ Index: linux-2.6.18-128.1.6/include/linux/jbd2.h
        /* Flags [no locking] */
        unsigned int    h_sync:         1;      /* sync-on-close */
        unsigned int    h_jdata:        1;      /* force data journaling */
-@@ -469,6 +498,8 @@
+@@ -467,6 +496,8 @@
   *    j_state_lock
   *    ->j_list_lock                   (journal_unmap_buffer)
   *
@@ -61,7 +61,7 @@ Index: linux-2.6.18-128.1.6/include/linux/jbd2.h
   */
  
  struct transaction_s
-@@ -615,6 +646,15 @@
+@@ -613,6 +644,15 @@
         */
        int t_handle_count;
  
@@ -77,7 +77,7 @@ Index: linux-2.6.18-128.1.6/include/linux/jbd2.h
  };
  
  struct transaction_run_stats_s {
-@@ -1018,6 +1058,9 @@
+@@ -1016,6 +1056,9 @@
  extern int     jbd2_journal_flush (journal_t *);
  extern void    jbd2_journal_lock_updates (journal_t *);
  extern void    jbd2_journal_unlock_updates (journal_t *);
@@ -87,11 +87,11 @@ Index: linux-2.6.18-128.1.6/include/linux/jbd2.h
  
  extern journal_t * jbd2_journal_init_dev(struct block_device *bdev,
                                struct block_device *fs_dev,
-Index: linux-2.6.18-128.1.6/fs/jbd2/checkpoint.c
+Index: linux-source-2.6.26/fs/jbd2/checkpoint.c
 ===================================================================
---- linux-2.6.18-128.1.6.orig/fs/jbd2/checkpoint.c     2009-04-15 
08:35:28.000000000 +0530
-+++ linux-2.6.18-128.1.6/fs/jbd2/checkpoint.c  2009-05-28 15:10:18.000000000 
+0530
-@@ -695,6 +695,7 @@
+--- linux-source-2.6.26.orig/fs/jbd2/checkpoint.c      2008-07-13 
23:51:29.000000000 +0200
++++ linux-source-2.6.26/fs/jbd2/checkpoint.c   2009-10-09 13:42:21.000000000 
+0200
+@@ -696,6 +696,7 @@
        J_ASSERT(transaction->t_checkpoint_list == NULL);
        J_ASSERT(transaction->t_checkpoint_io_list == NULL);
        J_ASSERT(transaction->t_updates == 0);
@@ -99,13 +99,13 @@ Index: linux-2.6.18-128.1.6/fs/jbd2/checkpoint.c
        J_ASSERT(journal->j_committing_transaction != transaction);
        J_ASSERT(journal->j_running_transaction != transaction);
  
-Index: linux-2.6.18-128.1.6/fs/jbd2/commit.c
+Index: linux-source-2.6.26/fs/jbd2/commit.c
 ===================================================================
---- linux-2.6.18-128.1.6.orig/fs/jbd2/commit.c 2009-04-15 08:35:28.000000000 
+0530
-+++ linux-2.6.18-128.1.6/fs/jbd2/commit.c      2009-05-28 15:12:45.000000000 
+0530
-@@ -898,6 +898,30 @@
-            transaction can be removed from any checkpoint list it was on
-            before. */
+--- linux-source-2.6.26.orig/fs/jbd2/commit.c  2008-07-13 23:51:29.000000000 
+0200
++++ linux-source-2.6.26/fs/jbd2/commit.c       2009-10-09 13:42:21.000000000 
+0200
+@@ -854,6 +854,30 @@
+               /* AKPM: bforget here */
+       }
  
 +      /*
 +       * Call any callbacks that had been registered for handles in this
@@ -131,38 +131,28 @@ Index: linux-2.6.18-128.1.6/fs/jbd2/commit.c
 +      }
 +      spin_unlock(&commit_transaction->t_jcb_lock);
 +
-       jbd_debug(3, "JBD: commit phase 7\n");
+       jbd_debug(3, "JBD: commit phase 6\n");
  
-       J_ASSERT(commit_transaction->t_sync_datalist == NULL);
-Index: linux-2.6.18-128.1.6/fs/jbd2/journal.c
+       if (!JBD2_HAS_INCOMPAT_FEATURE(journal,
+Index: linux-source-2.6.26/fs/jbd2/journal.c
 ===================================================================
---- linux-2.6.18-128.1.6.orig/fs/jbd2/journal.c        2009-04-15 
08:35:28.000000000 +0530
-+++ linux-2.6.18-128.1.6/fs/jbd2/journal.c     2009-05-28 17:13:35.000000000 
+0530
-@@ -80,6 +80,9 @@
+--- linux-source-2.6.26.orig/fs/jbd2/journal.c 2009-10-09 13:39:04.000000000 
+0200
++++ linux-source-2.6.26/fs/jbd2/journal.c      2009-10-09 13:43:03.000000000 
+0200
+@@ -82,6 +82,9 @@
  EXPORT_SYMBOL(jbd2_journal_invalidatepage);
  EXPORT_SYMBOL(jbd2_journal_try_to_free_buffers);
  EXPORT_SYMBOL(jbd2_journal_force_commit);
 +EXPORT_SYMBOL(jbd2_journal_callback_set);
 +EXPORT_SYMBOL(jbd2_journal_bmap);
-+EXPORT_SYMBOL(jbd2_log_start_commit);
++
  
  static int journal_convert_superblock_v1(journal_t *, journal_superblock_t *);
  static void __journal_abort_soft (journal_t *journal, int errno);
-Index: linux-2.6.18-128.1.6/fs/jbd2/transaction.c
+Index: linux-source-2.6.26/fs/jbd2/transaction.c
 ===================================================================
---- linux-2.6.18-128.1.6.orig/fs/jbd2/transaction.c    2009-04-15 
08:35:28.000000000 +0530
-+++ linux-2.6.18-128.1.6/fs/jbd2/transaction.c 2009-05-28 15:11:28.000000000 
+0530
-@@ -51,6 +51,9 @@
-       transaction->t_tid = journal->j_transaction_sequence++;
-       transaction->t_expires = jiffies + journal->j_commit_interval;
-       spin_lock_init(&transaction->t_handle_lock);
-+      INIT_LIST_HEAD(&transaction->t_jcb);
-+      spin_lock_init(&transaction->t_jcb_lock);
-+
- 
-       /* Set up the commit timer for the new transaction. */
-       journal->j_commit_timer.expires = round_jiffies(transaction->t_expires);
-@@ -251,6 +254,7 @@
+--- linux-source-2.6.26.orig/fs/jbd2/transaction.c     2008-07-13 
23:51:29.000000000 +0200
++++ linux-source-2.6.26/fs/jbd2/transaction.c  2009-10-09 13:42:21.000000000 
+0200
+@@ -252,6 +252,7 @@
        memset(handle, 0, sizeof(*handle));
        handle->h_buffer_credits = nblocks;
        handle->h_ref = 1;
@@ -170,7 +160,7 @@ Index: linux-2.6.18-128.1.6/fs/jbd2/transaction.c
  
        lockdep_init_map(&handle->h_lockdep_map, "jbd2_handle",
                                                &jbd2_handle_key, 0);
-@@ -1349,6 +1353,36 @@
+@@ -1350,6 +1351,36 @@
  }
  
  /**
@@ -207,7 +197,7 @@ Index: linux-2.6.18-128.1.6/fs/jbd2/transaction.c
   * int jbd2_journal_stop() - complete a transaction
   * @handle: tranaction to complete.
   *
-@@ -1422,6 +1456,11 @@
+@@ -1423,6 +1454,11 @@
                        wake_up(&journal->j_wait_transaction_locked);
        }
  
diff --git a/lustre/kernel_patches/patches/sd_iostats-2.6.22-vanilla.patch 
b/lustre/kernel_patches/patches/sd_iostats-2.6.26-vanilla.patch
similarity index 91%
copy from lustre/kernel_patches/patches/sd_iostats-2.6.22-vanilla.patch
copy to lustre/kernel_patches/patches/sd_iostats-2.6.26-vanilla.patch
index 9e822d2..f995730 100644
--- a/lustre/kernel_patches/patches/sd_iostats-2.6.22-vanilla.patch
+++ b/lustre/kernel_patches/patches/sd_iostats-2.6.26-vanilla.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.22.19/drivers/scsi/Kconfig
+Index: linux-source-2.6.26/drivers/scsi/Kconfig
 ===================================================================
---- linux-2.6.22.19.orig/drivers/scsi/Kconfig
-+++ linux-2.6.22.19/drivers/scsi/Kconfig
-@@ -76,6 +76,14 @@ config BLK_DEV_SD
+--- linux-source-2.6.26.orig/drivers/scsi/Kconfig      2009-10-09 
13:33:25.000000000 +0200
++++ linux-source-2.6.26/drivers/scsi/Kconfig   2009-10-09 13:39:06.000000000 
+0200
+@@ -81,6 +81,14 @@
          In this case, do not compile the driver for your SCSI host adapter
          (below) as a module either.
  
@@ -17,10 +17,10 @@ Index: linux-2.6.22.19/drivers/scsi/Kconfig
  config CHR_DEV_ST
        tristate "SCSI tape support"
        depends on SCSI
-Index: linux-2.6.22.19/drivers/scsi/scsi_proc.c
+Index: linux-source-2.6.26/drivers/scsi/scsi_proc.c
 ===================================================================
---- linux-2.6.22.19.orig/drivers/scsi/scsi_proc.c
-+++ linux-2.6.22.19/drivers/scsi/scsi_proc.c
+--- linux-source-2.6.26.orig/drivers/scsi/scsi_proc.c  2009-10-09 
13:33:25.000000000 +0200
++++ linux-source-2.6.26/drivers/scsi/scsi_proc.c       2009-10-09 
13:39:06.000000000 +0200
 @@ -40,7 +40,8 @@
  /* 4K page size, but our output routines, use some slack for overruns */
  #define PROC_BLOCK_SIZE (3*1024)
@@ -31,11 +31,11 @@ Index: linux-2.6.22.19/drivers/scsi/scsi_proc.c
  
  /* Protect sht->present and sht->proc_dir */
  static DEFINE_MUTEX(global_host_template_mutex);
-Index: linux-2.6.22.19/drivers/scsi/sd.c
+Index: linux-source-2.6.26/drivers/scsi/sd.c
 ===================================================================
---- linux-2.6.22.19.orig/drivers/scsi/sd.c
-+++ linux-2.6.22.19/drivers/scsi/sd.c
-@@ -94,6 +94,24 @@ static DEFINE_SPINLOCK(sd_index_lock);
+--- linux-source-2.6.26.orig/drivers/scsi/sd.c 2009-10-09 13:33:25.000000000 
+0200
++++ linux-source-2.6.26/drivers/scsi/sd.c      2009-10-09 13:39:50.000000000 
+0200
+@@ -107,6 +107,24 @@
   * object after last put) */
  static DEFINE_MUTEX(sd_ref_mutex);
  
@@ -60,24 +60,24 @@ Index: linux-2.6.22.19/drivers/scsi/sd.c
  static const char *sd_cache_types[] = {
        "write through", "none", "write back",
        "write back, no read (daft)"
-@@ -498,6 +516,8 @@ static int sd_init_command(struct scsi_c
-        */
-       SCpnt->done = sd_rw_intr;
+@@ -578,6 +596,8 @@
+ 
+       sdev = sdkp->device;
  
 +      sd_iostats_start_req(SCpnt);
 +
        /*
-        * This indicates that the command is ready from our end to be
-        * queued.
-@@ -980,6 +1000,7 @@ static void sd_rw_intr(struct scsi_cmnd 
+        * If the device is in error recovery, wait until it is done.
+        * If the device is offline, then disallow any access to it.
+@@ -1023,6 +1043,7 @@
                break;
        }
   out:
-+      sd_iostats_finish_req(SCpnt);
-       scsi_io_completion(SCpnt, good_bytes);
++      sd_iostats_finish_req(SCpnt);
+       return good_bytes;
  }
  
-@@ -1666,6 +1687,36 @@ static int sd_probe(struct device *dev)
+@@ -1712,6 +1733,36 @@
        if (sdp->removable)
                gd->flags |= GENHD_FL_REMOVABLE;
  
@@ -114,7 +114,7 @@ Index: linux-2.6.22.19/drivers/scsi/sd.c
        dev_set_drvdata(dev, sdkp);
        add_disk(gd);
  
-@@ -1709,6 +1760,366 @@ static int sd_remove(struct device *dev)
+@@ -1755,6 +1806,366 @@
        return 0;
  }
  
@@ -424,7 +424,7 @@ Index: linux-2.6.22.19/drivers/scsi/sd.c
 +      if (stats == NULL)
 +              return;
 +
-+      nsect = SCpnt->request_bufflen >> 9;
++      nsect = scsi_bufflen(SCpnt) >> 9;
 +      for (bucket = 0, tmp = nsect; tmp > 1; bucket++)
 +              tmp >>= 1;
 +
@@ -480,8 +480,8 @@ Index: linux-2.6.22.19/drivers/scsi/sd.c
 +
  /**
   *    scsi_disk_release - Called to free the scsi_disk structure
-  *    @cdev: pointer to embedded class device
-@@ -1727,10 +2138,16 @@ static void scsi_disk_release(struct cla
+  *    @dev: pointer to embedded class device
+@@ -1773,10 +2184,16 @@
        idr_remove(&sd_index_idr, sdkp->index);
        spin_unlock(&sd_index_lock);
  
@@ -499,7 +499,7 @@ Index: linux-2.6.22.19/drivers/scsi/sd.c
        kfree(sdkp);
  }
  
-@@ -1845,6 +2262,8 @@ static int __init init_sd(void)
+@@ -1890,6 +2307,8 @@
        if (!majors)
                return -ENODEV;
  
@@ -508,7 +508,7 @@ Index: linux-2.6.22.19/drivers/scsi/sd.c
        err = class_register(&sd_disk_class);
        if (err)
                goto err_out;
-@@ -1860,6 +2279,7 @@ err_out_class:
+@@ -1905,6 +2324,7 @@
  err_out:
        for (i = 0; i < SD_MAJORS; i++)
                unregister_blkdev(sd_major(i), "sd");
@@ -516,10 +516,10 @@ Index: linux-2.6.22.19/drivers/scsi/sd.c
        return err;
  }
  
-Index: linux-2.6.22.19/include/scsi/sd.h
+Index: linux-source-2.6.26/include/scsi/sd.h
 ===================================================================
---- linux-2.6.22.19.orig/include/scsi/sd.h
-+++ linux-2.6.22.19/include/scsi/sd.h
+--- linux-source-2.6.26.orig/include/scsi/sd.h 2009-10-09 13:33:25.000000000 
+0200
++++ linux-source-2.6.26/include/scsi/sd.h      2009-10-09 13:39:06.000000000 
+0200
 @@ -31,6 +31,46 @@
   */
  #define SD_BUF_SIZE           512
@@ -567,7 +567,7 @@ Index: linux-2.6.22.19/include/scsi/sd.h
  struct scsi_disk {
        struct scsi_driver *driver;     /* always &sd_template */
        struct scsi_device *device;
-@@ -44,6 +84,9 @@ struct scsi_disk {
+@@ -45,6 +85,9 @@
        unsigned        WCE : 1;        /* state of disk WCE bit */
        unsigned        RCD : 1;        /* state of disk RCD bit, unused */
        unsigned        DPOFUA : 1;     /* state of disk DPOFUA bit */
@@ -575,5 +575,5 @@ Index: linux-2.6.22.19/include/scsi/sd.h
 +      iostat_stats_t  *stats;         /* scsi disk statistics */
 +#endif
  };
- #define to_scsi_disk(obj) container_of(obj,struct scsi_disk,cdev)
+ #define to_scsi_disk(obj) container_of(obj,struct scsi_disk,dev)
  
diff --git a/lustre/kernel_patches/series/2.6.27-vanilla.series 
b/lustre/kernel_patches/series/2.6.26-vanilla.patch
similarity index 75%
copy from lustre/kernel_patches/series/2.6.27-vanilla.series
copy to lustre/kernel_patches/series/2.6.26-vanilla.patch
index f292811..86442ba 100644
--- a/lustre/kernel_patches/series/2.6.27-vanilla.series
+++ b/lustre/kernel_patches/series/2.6.26-vanilla.patch
@@ -3,12 +3,12 @@ vfs_races-2.6.22-vanilla.patch
 iopen-misc-2.6.22-vanilla.patch
 export-truncate-2.6.18-vanilla.patch 
 export_symbols-2.6.22-vanilla.patch 
-dev_read_only-2.6.27-vanilla.patch 
-export-2.6.27-vanilla.patch 
+dev_read_only-2.6.27-vanilla.patch
+export-2.6.26-vanilla.patch 
 export-show_task-2.6.27-vanilla.patch 
-sd_iostats-2.6.27-vanilla.patch
+sd_iostats-2.6.26-vanilla.patch
 md-mmp-unplug-dev-2.6.27-vanilla.patch
 quota-Split-off-quota-tree-handling-into-a-separate.patch
 quota-support-64-bit-quota-format-2.6.27-vanilla.patch
-jbd2-jcberr-2.6-sles11.patch
+jbd2-jcberr-2.6.26-vanilla.patch
 jbd2-commit-timer-no-jiffies-rounding.diff

-- 
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