Branch HEAD

Fix whitespace difference that caused patch reject.
b=10651

diff --git a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch
index 0453cf9..fa05b0c 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch
@@ -133,11 +133,11 @@ Index: linux-2.6.5-7.283/include/linux/ext3_fs.h
        __u32   s_hash_seed[4];         /* HTREE hash seed */
        __u8    s_def_hash_version;     /* Default hash version to use */
 -      __u8    s_reserved_char_pad;
--      __u16   s_reserved_word_pad;
+-      __u16   s_reserved_word_pad;
 +      __u8    s_jnl_backup_type;      /* Default type of journal backup */
 +      __u16   s_desc_size;            /* Group desc. size: INCOMPAT_64BIT */
        __u32   s_default_mount_opts;
--      __u32   s_first_meta_bg;        /* First metablock block group */
+-      __u32   s_first_meta_bg;        /* First metablock block group */
 -      __u32   s_reserved[190];        /* Padding to the end of the block */
 +      __u32   s_first_meta_bg;        /* First metablock block group */
 +      __u32   s_mkfs_time;            /* When the filesystem was created */

diff --git a/lustre/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch b/lustre/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch
index 0453cf9..fa05b0c 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/ext3-nanosecond-2.6-suse.patch
@@ -133,11 +133,11 @@ Index: linux-2.6.5-7.283/include/linux/ext3_fs.h
        __u32   s_hash_seed[4];         /* HTREE hash seed */
        __u8    s_def_hash_version;     /* Default hash version to use */
 -      __u8    s_reserved_char_pad;
--      __u16   s_reserved_word_pad;
+-      __u16   s_reserved_word_pad;
 +      __u8    s_jnl_backup_type;      /* Default type of journal backup */
 +      __u16   s_desc_size;            /* Group desc. size: INCOMPAT_64BIT */
        __u32   s_default_mount_opts;
--      __u32   s_first_meta_bg;        /* First metablock block group */
+-      __u32   s_first_meta_bg;        /* First metablock block group */
 -      __u32   s_reserved[190];        /* Padding to the end of the block */
 +      __u32   s_first_meta_bg;        /* First metablock block group */
 +      __u32   s_mkfs_time;            /* When the filesystem was created */