Branch b1_8

b=19212

i=bobijam, brian

Get rid of the fuzz chunk as vendor's convention.

diff --git a/lustre/kernel_patches/patches/jbd-2.6.10-jcberr.patch b/lustre/kernel_patches/patches/jbd-2.6.10-jcberr.patch
index 64085b9..c4b253a 100644 (file)
--- a/lustre/kernel_patches/patches/jbd-2.6.10-jcberr.patch
+++ b/lustre/kernel_patches/patches/jbd-2.6.10-jcberr.patch
@@ -76,7 +76,7 @@
  
  /**
 @@ -881,6 +921,10 @@
- extern int     journal_try_to_free_buffers(journal_t *, struct page *, int);
+ extern int     journal_try_to_free_buffers(journal_t *, struct page *, gfp_t);
  extern int     journal_stop(handle_t *);
  extern int     journal_flush (journal_t *);
 +extern void    journal_callback_set(handle_t *handle,
@@ -100,8 +100,8 @@
 --- 1.53/fs/jbd/commit.c       2004-10-19 03:40:17 -06:00
 +++ 1.54/fs/jbd/commit.c       2004-11-07 19:13:24 -07:00
 @@ -686,6 +686,30 @@
-       if (err)
-               __journal_abort_hard(journal);
+            transaction can be removed from any checkpoint list it was on
+            before. */
  
 +      /*
 +       * Call any callbacks that had been registered for handles in this

diff --git a/lustre/kernel_patches/patches/sd_iostats-2.6-rhel5.patch b/lustre/kernel_patches/patches/sd_iostats-2.6-rhel5.patch
index d0cc6f6..ced2c53 100644 (file)
--- a/lustre/kernel_patches/patches/sd_iostats-2.6-rhel5.patch
+++ b/lustre/kernel_patches/patches/sd_iostats-2.6-rhel5.patch
@@ -3,8 +3,8 @@ Index: linux-2.6.18-53.1.21/drivers/scsi/Kconfig
 --- linux-2.6.18-53.1.21.orig/drivers/scsi/Kconfig
 +++ linux-2.6.18-53.1.21/drivers/scsi/Kconfig
 @@ -66,6 +66,14 @@ config BLK_DEV_SD
-         In this case, do not compile the driver for your SCSI host adapter
-         (below) as a module either.
+          polling I/O.  If it doesn't, LKCD will fall back to ordinary
+          interrupt-driven I/O.
  
 +config SD_IOSTATS
 +   bool "Enable SCSI disk I/O stats"