b=21669 cast the le64 to %llu in all ext*mmp patches

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext3-mmp-2.6.22-vanilla.patch

diff --git a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla.patch
index e041985..527b928 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.22-vanilla.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.22.19/fs/ext3/super.c
+Index: linux-2.6.22.14/fs/ext3/super.c
 ===================================================================
---- linux-2.6.22.19.orig/fs/ext3/super.c
-+++ linux-2.6.22.19/fs/ext3/super.c
+--- linux-2.6.22.14.orig/fs/ext3/super.c
++++ linux-2.6.22.14/fs/ext3/super.c
 @@ -35,6 +35,8 @@
  #include <linux/namei.h>
  #include <linux/quotaops.h>
@@ -20,7 +20,7 @@ Index: linux-2.6.22.19/fs/ext3/super.c
        if (sbi->s_dev_proc) {
                remove_proc_entry(sbi->s_dev_proc->name, proc_root_ext3);
                sbi->s_dev_proc = NULL;
-@@ -1538,6 +1542,313 @@ static ext3_fsblk_t descriptor_loc(struc
+@@ -1538,6 +1542,329 @@ static ext3_fsblk_t descriptor_loc(struc
        return (has_super + ext3_group_first_block_no(sb, bg));
  }
  
@@ -54,9 +54,25 @@ Index: linux-2.6.22.19/fs/ext3/super.c
 +      if (*bh)
 +              clear_buffer_uptodate(*bh);
 +
++#if 0
 +      brelse(*bh);
 +
 +      *bh = sb_bread(sb, mmp_block);
++#else
++      if (!*bh)
++              *bh = sb_getblk(sb, mmp_block);
++      if (*bh) {
++              get_bh(*bh);
++              lock_buffer(*bh);
++              (*bh)->b_end_io = end_buffer_read_sync;
++              submit_bh(READ_SYNC, *bh);
++              wait_on_buffer(*bh);
++              if (!buffer_uptodate(*bh)) {
++                      brelse(*bh);
++                      *bh = NULL;
++              }
++      }
++#endif
 +      if (!*bh) {
 +              ext3_warning(sb, __FUNCTION__,
 +                           "Error while reading MMP block %lu", mmp_block);
@@ -79,8 +95,8 @@ Index: linux-2.6.22.19/fs/ext3/super.c
 +      ext3_warning(sb, function, msg);
 +      ext3_warning(sb, function, "MMP failure info: last update time: %llu, "
 +                   "last update node: %s, last update device: %s\n",
-+                   le64_to_cpu(mmp->mmp_time), mmp->mmp_nodename,
-+                   mmp->mmp_bdevname);
++                   (long long unsigned int)le64_to_cpu(mmp->mmp_time),
++                   mmp->mmp_nodename, mmp->mmp_bdevname);
 +}
 +
 +/*
@@ -334,7 +350,7 @@ Index: linux-2.6.22.19/fs/ext3/super.c
  
  static int ext3_fill_super (struct super_block *sb, void *data, int silent)
  {
-@@ -1875,6 +2186,11 @@ static int ext3_fill_super (struct super
+@@ -1875,6 +2202,11 @@ static int ext3_fill_super (struct super
                          EXT3_HAS_INCOMPAT_FEATURE(sb,
                                    EXT3_FEATURE_INCOMPAT_RECOVER));
  
@@ -346,7 +362,16 @@ Index: linux-2.6.22.19/fs/ext3/super.c
        /*
         * The first inode we look at is the journal inode.  Don't try
         * root first: it may be modified in the journal!
-@@ -2482,7 +2798,7 @@ static int ext3_remount (struct super_bl
+@@ -2007,6 +2339,8 @@ cantfind_ext3:
+ failed_mount4:
+       journal_destroy(sbi->s_journal);
+ failed_mount3:
++      if (sbi->s_mmp_tsk)
++              kthread_stop(sbi->s_mmp_tsk);
+       percpu_counter_destroy(&sbi->s_freeblocks_counter);
+       percpu_counter_destroy(&sbi->s_freeinodes_counter);
+       percpu_counter_destroy(&sbi->s_dirs_counter);
+@@ -2482,7 +2816,7 @@ static int ext3_remount (struct super_bl
        ext3_fsblk_t n_blocks_count = 0;
        unsigned long old_sb_flags;
        struct ext3_mount_options old_opts;
@@ -355,22 +380,24 @@ Index: linux-2.6.22.19/fs/ext3/super.c
  #ifdef CONFIG_QUOTA
        int i;
  #endif
-@@ -2580,6 +2896,11 @@ static int ext3_remount (struct super_bl
+@@ -2580,6 +2914,13 @@ static int ext3_remount (struct super_bl
                                goto restore_opts;
                        if (!ext3_setup_super (sb, es, 0))
                                sb->s_flags &= ~MS_RDONLY;
 +                      if (EXT3_HAS_INCOMPAT_FEATURE(sb,
 +                                                  EXT3_FEATURE_INCOMPAT_MMP))
 +                              if (ext3_multi_mount_protect(sb,
-+                                              le64_to_cpu(es->s_mmp_block)))
++                                              le64_to_cpu(es->s_mmp_block))) {
++                                      err = -EROFS;
 +                                      goto restore_opts;
++                              }
                }
        }
  #ifdef CONFIG_QUOTA
-Index: linux-2.6.22.19/include/linux/ext3_fs.h
+Index: linux-2.6.22.14/include/linux/ext3_fs.h
 ===================================================================
---- linux-2.6.22.19.orig/include/linux/ext3_fs.h
-+++ linux-2.6.22.19/include/linux/ext3_fs.h
+--- linux-2.6.22.14.orig/include/linux/ext3_fs.h
++++ linux-2.6.22.14/include/linux/ext3_fs.h
 @@ -608,13 +608,17 @@ struct ext3_super_block {
        __le32  s_first_meta_bg;        /* First metablock block group */
        __le32  s_mkfs_time;            /* When the filesystem was created */
@@ -448,10 +475,10 @@ Index: linux-2.6.22.19/include/linux/ext3_fs.h
   * Function prototypes
   */
  
-Index: linux-2.6.22.19/include/linux/ext3_fs_sb.h
+Index: linux-2.6.22.14/include/linux/ext3_fs_sb.h
 ===================================================================
---- linux-2.6.22.19.orig/include/linux/ext3_fs_sb.h
-+++ linux-2.6.22.19/include/linux/ext3_fs_sb.h
+--- linux-2.6.22.14.orig/include/linux/ext3_fs_sb.h
++++ linux-2.6.22.14/include/linux/ext3_fs_sb.h
 @@ -158,6 +158,7 @@ struct ext3_sb_info {
        /* locality groups */
        struct ext3_locality_group *s_locality_groups;