branch: b1_8

update from b1_5 (20060914_1308)

diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-fc5.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-fc5.patch
index 325d080..b807900 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-fc5.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-fc5.patch
@@ -1387,8 +1387,8 @@ Index: linux-2.6.16.i686/fs/ext3/mballoc.c
 +                       * Someone more lucky has already allocated it.
 +                       * The only thing we can do is just take first
 +                       * found block(s)
-+                       */
 +                      printk(KERN_ERR "EXT3-fs: and someone won our chunk\n");
++                       */
 +                      ac.ac_b_ex.fe_group = 0;
 +                      ac.ac_b_ex.fe_start = 0;
 +                      ac.ac_b_ex.fe_len = 0;

diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.18-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.18-vanilla.patch
index 0040a6f..13f3482 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.18-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.18-vanilla.patch
@@ -1356,8 +1356,8 @@ Index: linux-stage/fs/ext3/mballoc.c
 +                       * Someone more lucky has already allocated it.
 +                       * The only thing we can do is just take first
 +                       * found block(s)
-+                       */
 +                      printk(KERN_ERR "EXT3-fs: and someone won our chunk\n");
++                       */
 +                      ac.ac_b_ex.fe_group = 0;
 +                      ac.ac_b_ex.fe_start = 0;
 +                      ac.ac_b_ex.fe_len = 0;

diff --git a/lustre/kernel_patches/patches/ext3-mballoc2-2.6-fc5.patch b/lustre/kernel_patches/patches/ext3-mballoc2-2.6-fc5.patch
index 325d080..b807900 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-mballoc2-2.6-fc5.patch
+++ b/lustre/kernel_patches/patches/ext3-mballoc2-2.6-fc5.patch
@@ -1387,8 +1387,8 @@ Index: linux-2.6.16.i686/fs/ext3/mballoc.c
 +                       * Someone more lucky has already allocated it.
 +                       * The only thing we can do is just take first
 +                       * found block(s)
-+                       */
 +                      printk(KERN_ERR "EXT3-fs: and someone won our chunk\n");
++                       */
 +                      ac.ac_b_ex.fe_group = 0;
 +                      ac.ac_b_ex.fe_start = 0;
 +                      ac.ac_b_ex.fe_len = 0;

diff --git a/lustre/kernel_patches/patches/ext3-mballoc2-2.6.18-vanilla.patch b/lustre/kernel_patches/patches/ext3-mballoc2-2.6.18-vanilla.patch
index 0040a6f..13f3482 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-mballoc2-2.6.18-vanilla.patch
+++ b/lustre/kernel_patches/patches/ext3-mballoc2-2.6.18-vanilla.patch
@@ -1356,8 +1356,8 @@ Index: linux-stage/fs/ext3/mballoc.c
 +                       * Someone more lucky has already allocated it.
 +                       * The only thing we can do is just take first
 +                       * found block(s)
-+                       */
 +                      printk(KERN_ERR "EXT3-fs: and someone won our chunk\n");
++                       */
 +                      ac.ac_b_ex.fe_group = 0;
 +                      ac.ac_b_ex.fe_start = 0;
 +                      ac.ac_b_ex.fe_len = 0;

diff --git a/lustre/kernel_patches/patches/vfs_races-2.6.18-vanilla.patch b/lustre/kernel_patches/patches/vfs_races-2.6.18-vanilla.patch
index 36b2e65..5898ff7 100644 (file)
--- a/lustre/kernel_patches/patches/vfs_races-2.6.18-vanilla.patch
+++ b/lustre/kernel_patches/patches/vfs_races-2.6.18-vanilla.patch
@@ -1,7 +1,7 @@
 Index: linux-2.6/fs/dcache.c
 ===================================================================
---- linux-2.6.orig/fs/dcache.c 2006-07-15 16:08:36.000000000 +0800
-+++ linux-2.6/fs/dcache.c      2006-07-15 16:10:41.000000000 +0800
+--- linux-2.6.orig/fs/dcache.c 2006-08-31 11:59:09.000000000 +0800
++++ linux-2.6/fs/dcache.c      2006-09-06 14:01:37.000000000 +0800
 @@ -226,6 +226,13 @@ int d_invalidate(struct dentry * dentry)
                spin_unlock(&dcache_lock);
                return 0;
@@ -48,14 +48,13 @@ Index: linux-2.6/fs/dcache.c
        x = y; y = __tmp; } while (0)
 Index: linux-2.6/include/linux/dcache.h
 ===================================================================
---- linux-2.6.orig/include/linux/dcache.h      2006-07-15 16:10:33.000000000 +0800
-+++ linux-2.6/include/linux/dcache.h   2006-07-15 16:10:41.000000000 +0800
-@@ -176,6 +176,8 @@ d_iput:            no              no              no       yes
+--- linux-2.6.orig/include/linux/dcache.h      2006-08-31 12:00:23.000000000 +0800
++++ linux-2.6/include/linux/dcache.h   2006-09-06 14:02:36.000000000 +0800
+@@ -176,6 +176,7 @@ d_iput:            no              no              no       yes
  
  #define DCACHE_REFERENCED     0x0008  /* Recently used, don't discard. */
  #define DCACHE_UNHASHED               0x0010  
-+#define DCACHE_LUSTRE_INVALID     0x0020  /* Lustre invalidated */
-+
++#define DCACHE_LUSTRE_INVALID 0x0040  /* Lustre invalidated */
  
  #define DCACHE_INOTIFY_PARENT_WATCHED 0x0020 /* Parent inode is watched */
  

diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c
index 3bc709d..dbd3c36 100644 (file)
--- a/lustre/ptlrpc/wiretest.c
+++ b/lustre/ptlrpc/wiretest.c
@@ -375,10 +375,6 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct obd_connect_data, ocd_brw_size));
         LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_brw_size) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_brw_size));
-        LASSERTF((int)offsetof(struct obd_connect_data, ocd_brw_size) == 20, " found %lld\n",
-                 (long long)(int)offsetof(struct obd_connect_data, ocd_brw_size));
-        LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_brw_size) == 4, " found %lld\n",
-                 (long long)(int)sizeof(((struct obd_connect_data *)0)->ocd_brw_size));
         LASSERTF((int)offsetof(struct obd_connect_data, ocd_ibits_known) == 24, " found %lld\n",
                  (long long)(int)offsetof(struct obd_connect_data, ocd_ibits_known));
         LASSERTF((int)sizeof(((struct obd_connect_data *)0)->ocd_ibits_known) == 8, " found %lld\n",
@@ -425,7 +421,7 @@ void lustre_assert_wire_constants(void)
         CLASSERT(OBD_CONNECT_LCL_CLIENT == 0x10000ULL);
         CLASSERT(OBD_CONNECT_RMT_CLIENT == 0x20000ULL);
         CLASSERT(OBD_CONNECT_BRW_SIZE == 0x40000ULL);
-       CLASSERT(OBD_CONNECT_QUOTA64 == 0x80000ULL);
+        CLASSERT(OBD_CONNECT_QUOTA64 == 0x80000ULL);
 
         /* Checks for struct obdo */
         LASSERTF((int)sizeof(struct obdo) == 208, " found %lld\n",
@@ -1944,6 +1940,26 @@ void lustre_assert_wire_constants(void)
         LASSERTF((int)sizeof(((struct qunit_data *)0)->qd_count) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct qunit_data *)0)->qd_count));
 
+        /* Checks for struct qunit_data_old */
+        LASSERTF((int)sizeof(struct qunit_data_old) == 16, " found %lld\n",
+                 (long long)(int)sizeof(struct qunit_data_old));
+        LASSERTF((int)offsetof(struct qunit_data_old, qd_id) == 0, " found %lld\n",
+                 (long long)(int)offsetof(struct qunit_data_old, qd_id));
+        LASSERTF((int)sizeof(((struct qunit_data_old *)0)->qd_id) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct qunit_data_old *)0)->qd_id));
+        LASSERTF((int)offsetof(struct qunit_data_old, qd_type) == 4, " found %lld\n",
+                 (long long)(int)offsetof(struct qunit_data_old, qd_type));
+        LASSERTF((int)sizeof(((struct qunit_data_old *)0)->qd_type) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct qunit_data_old *)0)->qd_type));
+        LASSERTF((int)offsetof(struct qunit_data_old, qd_count) == 8, " found %lld\n",
+                 (long long)(int)offsetof(struct qunit_data_old, qd_count));
+        LASSERTF((int)sizeof(((struct qunit_data_old *)0)->qd_count) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct qunit_data_old *)0)->qd_count));
+        LASSERTF((int)offsetof(struct qunit_data_old, qd_isblk) == 12, " found %lld\n",
+                 (long long)(int)offsetof(struct qunit_data_old, qd_isblk));
+        LASSERTF((int)sizeof(((struct qunit_data_old *)0)->qd_isblk) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct qunit_data_old *)0)->qd_isblk));
+
         /* Checks for struct mgs_target_info */
         LASSERTF((int)sizeof(struct mgs_target_info) == 2496, " found %lld\n",
                  (long long)(int)sizeof(struct mgs_target_info));
@@ -2035,6 +2051,10 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)offsetof(struct lustre_disk_data, ldd_uuid));
         LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_uuid) == 40, " found %lld\n",
                  (long long)(int)sizeof(((struct lustre_disk_data *)0)->ldd_uuid));
+        LASSERTF((int)offsetof(struct lustre_disk_data, ldd_userdata) == 200, " found %lld\n",
+                 (long long)(int)offsetof(struct lustre_disk_data, ldd_userdata));
+        LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_userdata) == 824, " found %lld\n",
+                 (long long)(int)sizeof(((struct lustre_disk_data *)0)->ldd_userdata));
         LASSERTF((int)offsetof(struct lustre_disk_data, ldd_mount_opts) == 4096, " found %lld\n",
                  (long long)(int)offsetof(struct lustre_disk_data, ldd_mount_opts));
         LASSERTF((int)sizeof(((struct lustre_disk_data *)0)->ldd_mount_opts) == 4096, " found %lld\n",