ldiskfs/kernel_patches/patches/ext4-misc-sles11.patch

   1 Index: linux-2.6.27.21-0.1/fs/ext4/ext4_jbd2.h
   2 ===================================================================
   3 --- linux-2.6.27.21-0.1.orig/fs/ext4/ext4_jbd2.h
   4 +++ linux-2.6.27.21-0.1/fs/ext4/ext4_jbd2.h
   5 @@ -35,6 +35,9 @@
   6         (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS)   \
   7                 || test_opt(sb, EXTENTS) ? 27U : 8U)
   8
   9 +/* Indicate that EXT4_SINGLEDATA_TRANS_BLOCKS takes the sb as argument */
  10 +#define EXT4_SINGLEDATA_TRANS_BLOCKS_HAS_SB
  11 +
  12  /* Extended attribute operations touch at most two data buffers,
  13   * two bitmap buffers, and two group summaries, in addition to the inode
  14   * and the superblock, which are already accounted for. */
  15 Index: linux-2.6.27.21-0.1/fs/ext4/extents.c
  16 ===================================================================
  17 --- linux-2.6.27.21-0.1.orig/fs/ext4/extents.c
  18 +++ linux-2.6.27.21-0.1/fs/ext4/extents.c
  19 @@ -48,7 +48,7 @@
  20   * ext_pblock:
  21   * combine low and high parts of physical block number into ext4_fsblk_t
  22   */
  23 -static ext4_fsblk_t ext_pblock(struct ext4_extent *ex)
  24 +ext4_fsblk_t ext_pblock(struct ext4_extent *ex)
  25  {
  26         ext4_fsblk_t block;
  27
  28 @@ -58,6 +58,17 @@ static ext4_fsblk_t ext_pblock(struct ex
  29  }
  30
  31  /*
  32 + * ext4_ext_store_pblock:
  33 + * stores a large physical block number into an extent struct,
  34 + * breaking it into parts
  35 + */
  36 +void ext4_ext_store_pblock(struct ext4_extent *ex, ext4_fsblk_t pb)
  37 +{
  38 +       ex->ee_start_lo = cpu_to_le32((unsigned long) (pb & 0xffffffff));
  39 +       ex->ee_start_hi = cpu_to_le16((unsigned long) ((pb >> 31) >> 1) & 0xffff);
  40 +}
  41 +
  42 +/*
  43   * idx_pblock:
  44   * combine low and high parts of a leaf physical block number into ext4_fsblk_t
  45   */
  46 @@ -71,17 +82,6 @@ ext4_fsblk_t idx_pblock(struct ext4_exte
  47  }
  48
  49  /*
  50 - * ext4_ext_store_pblock:
  51 - * stores a large physical block number into an extent struct,
  52 - * breaking it into parts
  53 - */
  54 -void ext4_ext_store_pblock(struct ext4_extent *ex, ext4_fsblk_t pb)
  55 -{
  56 -       ex->ee_start_lo = cpu_to_le32((unsigned long) (pb & 0xffffffff));
  57 -       ex->ee_start_hi = cpu_to_le16((unsigned long) ((pb >> 31) >> 1) & 0xffff);
  58 -}
  59 -
  60 -/*
  61   * ext4_idx_store_pblock:
  62   * stores a large physical block number into an index struct,
  63   * breaking it into parts
  64 @@ -1851,6 +1851,56 @@ static int ext4_ext_rm_idx(handle_t *han
  65  }
  66
  67  /*
  68 + * This routine returns max. credits extent tree can consume.
  69 + * It should be OK for low-performance paths like ->writepage()
  70 + * To allow many writing process to fit a single transaction,
  71 + * caller should calculate credits under truncate_mutex and
  72 + * pass actual path.
  73 + */
  74 +int ext4_ext_calc_credits_for_insert(struct inode *inode,
  75 +                                   struct ext4_ext_path *path)
  76 +{
  77 +       int depth, needed;
  78 +
  79 +       if (path) {
  80 +               /* probably there is space in leaf? */
  81 +               depth = ext_depth(inode);
  82 +               if (le16_to_cpu(path[depth].p_hdr->eh_entries)
  83 +                               < le16_to_cpu(path[depth].p_hdr->eh_max))
  84 +                       return 1;
  85 +       }
  86 +
  87 +       /*
  88 +        * given 32bit logical block (4294967296 blocks), max. tree
  89 +        * can be 4 levels in depth -- 4 * 340^4 == 53453440000.
  90 +        * let's also add one more level for imbalance.
  91 +        */
  92 +       depth = 5;
  93 +
  94 +       /* allocation of new data block(s) */
  95 +       needed = 2;
  96 +
  97 +       /*
  98 +        * tree can be full, so it'd need to grow in depth:
  99 +        * we need one credit to modify old root, credits for
 100 +        * new root will be added in split accounting
 101 +        */
 102 +       needed += 1;
 103 +
 104 +       /*
 105 +        * Index split can happen, we'd need:
 106 +        *    allocate intermediate indexes (bitmap + group)
 107 +        *  + change two blocks at each level, but root (already included)
 108 +        */
 109 +       needed += (depth * 2) + (depth * 2);
 110 +
 111 +       /* any allocation modifies superblock */
 112 +       needed += 1;
 113 +
 114 +       return needed;
 115 +}
 116 +
 117 +/*
 118   * ext4_ext_calc_credits_for_single_extent:
 119   * This routine returns max. credits that needed to insert an extent
 120   * to the extent tree.
 121 @@ -3170,3 +3220,14 @@ int ext4_fiemap(struct inode *inode, str
 122
 123         return error;
 124  }
 125 +
 126 +EXPORT_SYMBOL(ext4_ext_store_pblock);
 127 +EXPORT_SYMBOL(ext4_ext_search_right);
 128 +EXPORT_SYMBOL(ext4_ext_search_left);
 129 +EXPORT_SYMBOL(ext_pblock);
 130 +EXPORT_SYMBOL(ext4_ext_insert_extent);
 131 +EXPORT_SYMBOL(ext4_mb_new_blocks);
 132 +EXPORT_SYMBOL(ext4_ext_walk_space);
 133 +EXPORT_SYMBOL(ext4_ext_calc_credits_for_insert);
 134 +EXPORT_SYMBOL(ext4_mark_inode_dirty);
 135 +
 136 Index: linux-2.6.27.21-0.1/fs/ext4/ext4_extents.h
 137 ===================================================================
 138 --- linux-2.6.27.21-0.1.orig/fs/ext4/ext4_extents.h
 139 +++ linux-2.6.27.21-0.1/fs/ext4/ext4_extents.h
 140 @@ -59,6 +59,11 @@
 141   */
 142  #define EXT_STATS_
 143
 144 +/*
 145 + * define EXT4_ALLOC_NEEDED to 0 since block bitmap, group desc. and sb
 146 + * are now accounted in ext4_ext_calc_credits_for_insert()
 147 + */
 148 +#define EXT4_ALLOC_NEEDED 0
 149
 150  /*
 151   * ext4_inode has i_block array (60 bytes total).
 152 @@ -124,6 +129,7 @@ struct ext4_ext_path {
 153  #define EXT4_EXT_CACHE_GAP     1
 154  #define EXT4_EXT_CACHE_EXTENT  2
 155
 156 +#define EXT4_EXT_HAS_NO_TREE  /* ext4_extents_tree struct is not used*/
 157
 158  #define EXT_MAX_BLOCK  0xffffffff
 159
 160 @@ -223,10 +229,14 @@ static inline int ext4_ext_get_actual_le
 161                 (le16_to_cpu(ext->ee_len) - EXT_INIT_MAX_LEN));
 162  }
 163
 164 +extern ext4_fsblk_t ext_pblock(struct ext4_extent *ex);
 165 +extern void ext4_ext_store_pblock(struct ext4_extent *ex, ext4_fsblk_t pb);
 166  extern int ext4_ext_calc_metadata_amount(struct inode *inode, int blocks);
 167  extern ext4_fsblk_t idx_pblock(struct ext4_extent_idx *);
 168  extern void ext4_ext_store_pblock(struct ext4_extent *, ext4_fsblk_t);
 169  extern int ext4_extent_tree_init(handle_t *, struct inode *);
 170 +extern int ext4_ext_calc_credits_for_insert(struct inode *,
 171 +                                           struct ext4_ext_path *);
 172  extern int ext4_ext_calc_credits_for_single_extent(struct inode *inode,
 173                                                    int num,
 174                                                    struct ext4_ext_path *path);
 175 Index: linux-2.6.27.21-0.1/fs/ext4/mballoc.c
 176 ===================================================================
 177 --- linux-2.6.27.21-0.1.orig/fs/ext4/mballoc.c
 178 +++ linux-2.6.27.21-0.1/fs/ext4/mballoc.c
 179 @@ -4348,6 +4348,13 @@ repeat:
 180                 kmem_cache_free(ext4_ac_cachep, ac);
 181  }
 182
 183 +/* For backward compatibility, since Lustre uses this symbol */
 184 +void ext4_mb_discard_inode_preallocations(struct inode *inode)
 185 +{
 186 +       ext4_discard_preallocations(inode);
 187 +}
 188 +EXPORT_SYMBOL(ext4_mb_discard_inode_preallocations);
 189 +
 190  /*
 191   * finds all preallocated spaces and return blocks being freed to them
 192   * if preallocated space becomes full (no block is used from the space)
 193 @@ -5170,3 +5177,6 @@ error_return:
 194                 kmem_cache_free(ext4_ac_cachep, ac);
 195         return;
 196  }
 197 +
 198 +EXPORT_SYMBOL(ext4_free_blocks);
 199 +
 200 Index: linux-2.6.27.21-0.1/fs/ext4/super.c
 201 ===================================================================
 202 --- linux-2.6.27.21-0.1.orig/fs/ext4/super.c
 203 +++ linux-2.6.27.21-0.1/fs/ext4/super.c
 204 @@ -91,6 +91,7 @@ ext4_fsblk_t ext4_inode_bitmap(struct su
 205                 (EXT4_DESC_SIZE(sb) >= EXT4_MIN_DESC_SIZE_64BIT ?
 206                 (ext4_fsblk_t)le32_to_cpu(bg->bg_inode_bitmap_hi) << 32 : 0);
 207  }
 208 +EXPORT_SYMBOL(ext4_inode_bitmap);
 209
 210  ext4_fsblk_t ext4_inode_table(struct super_block *sb,
 211                               struct ext4_group_desc *bg)
 212 @@ -1295,6 +1296,7 @@ enum {
 213         Opt_stripe, Opt_delalloc, Opt_nodelalloc,
 214         Opt_inode_readahead_blks, Opt_bigendian_extents,
 215         Opt_iopen, Opt_noiopen, Opt_iopen_nopriv,
 216 +       Opt_mballoc
 217  };
 218
 219  static const match_table_t tokens = {
 220 @@ -1356,6 +1358,7 @@ static const match_table_t tokens = {
 221         {Opt_nodelalloc, "nodelalloc"},
 222         {Opt_inode_readahead_blks, "inode_readahead_blks=%u"},
 223         {Opt_bigendian_extents, "bigendian_extents"},
 224 +       {Opt_mballoc, "mballoc"},
 225         {Opt_err, NULL},
 226  };
 227
 228 @@ -1774,6 +1777,8 @@ set_qf_format:
 229                 case Opt_bigendian_extents:
 230                         bigendian_extents = 1;
 231                         break;
 232 +               case Opt_mballoc:
 233 +                       break;
 234                 default:
 235                         printk(KERN_ERR
 236                                "EXT4-fs: Unrecognized mount option \"%s\" "
 237 @@ -4095,7 +4100,7 @@ static struct file_system_type ext4dev_f
 238         .kill_sb        = kill_block_super,
 239         .fs_flags       = FS_REQUIRES_DEV,
 240  };
 241 -MODULE_ALIAS("ext4dev");
 242 +MODULE_ALIAS("ext4");
 243
 244  static int __init init_ext4_fs(void)
 245  {
 246 Index: linux-2.6.27.21-0.1/fs/ext4/ext4_jbd2.c
 247 ===================================================================
 248 --- linux-2.6.27.21-0.1.orig/fs/ext4/ext4_jbd2.c
 249 +++ linux-2.6.27.21-0.1/fs/ext4/ext4_jbd2.c
 250 @@ -21,6 +21,7 @@ int __ext4_journal_get_write_access(cons
 251                 ext4_journal_abort_handle(where, __func__, bh, handle, err);
 252         return err;
 253  }
 254 +EXPORT_SYMBOL(__ext4_journal_get_write_access);
 255
 256  int __ext4_journal_forget(const char *where, handle_t *handle,
 257                                 struct buffer_head *bh)
 258 @@ -57,3 +58,4 @@ int __ext4_journal_dirty_metadata(const
 259                 ext4_journal_abort_handle(where, __func__, bh, handle, err);
 260         return err;
 261  }
 262 +EXPORT_SYMBOL(__ext4_journal_dirty_metadata);
 263 Index: linux-2.6.27.21-0.1/fs/ext4/ext4.h
 264 ===================================================================
 265 --- linux-2.6.27.21-0.1.orig/fs/ext4/ext4.h
 266 +++ linux-2.6.27.21-0.1/fs/ext4/ext4.h
 267 @@ -26,6 +26,9 @@
 268   * The fourth extended filesystem constants/structures
 269   */
 270
 271 +/* Has been moved to linux/magic.h but we need it for Lustre */
 272 +#define EXT4_SUPER_MAGIC       0xEF53
 273 +
 274  /*
 275   * Define EXT4FS_DEBUG to produce debug messages
 276   */
 277 @@ -1116,6 +1119,8 @@ extern void ext4_mb_update_group_info(st
 278  extern int ext4_mb_get_buddy_cache_lock(struct super_block *, ext4_group_t);
 279  extern void ext4_mb_put_buddy_cache_lock(struct super_block *,
 280                                                 ext4_group_t, int);
 281 +extern void ext4_mb_discard_inode_preallocations(struct inode *);
 282 +
 283  /* inode.c */
 284  int ext4_forget(handle_t *handle, int is_metadata, struct inode *inode,
 285                 struct buffer_head *bh, ext4_fsblk_t blocknr);
 286 Index: linux-2.6.27.21-0.1/fs/ext4/inode.c
 287 ===================================================================
 288 --- linux-2.6.27.21-0.1.orig/fs/ext4/inode.c
 289 +++ linux-2.6.27.21-0.1/fs/ext4/inode.c
 290 @@ -4240,6 +4240,7 @@ bad_inode:
 291         iget_failed(inode);
 292         return ERR_PTR(ret);
 293  }
 294 +EXPORT_SYMBOL(ext4_iget);
 295
 296  static int ext4_inode_blocks_set(handle_t *handle,
 297                                 struct ext4_inode *raw_inode,