iam: disable dx_bug11027_check().

diff --git a/lustre/kernel_patches/patches/ext3-pdirops-2.6.9.patch b/lustre/kernel_patches/patches/ext3-pdirops-2.6.9.patch
index 19e11ee..d6981fd 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-pdirops-2.6.9.patch
+++ b/lustre/kernel_patches/patches/ext3-pdirops-2.6.9.patch
@@ -45,12 +45,13 @@ Index: iam/fs/ext3/namei.c
  static inline void dx_set_limit(struct iam_entry *entries, unsigned value)
  {
        ((struct dx_countlimit *) entries)->limit = cpu_to_le16(value);
-@@ -116,6 +121,39 @@ int dx_index_is_compat(struct iam_path *
+@@ -116,6 +121,41 @@ int dx_index_is_compat(struct iam_path *
  }
  
  
-+int dx_bug11027_check(struct iam_path *p, struct iam_frame *f)
++static int dx_bug11027_check(struct iam_path *p, struct iam_frame *f)
 +{
++#if 0
 +      struct iam_entry     *e;
 +      struct iam_container *c;
 +      unsigned count;
@@ -79,13 +80,14 @@ Index: iam/fs/ext3/namei.c
 +                      return 0;
 +              }
 +      }
++#endif
 +      return 1;
 +}
 +
  int dx_node_check(struct iam_path *p, struct iam_frame *f)
  {
        struct iam_entry     *e;
-@@ -241,12 +279,183 @@ struct stats dx_show_entries(struct dx_h
+@@ -241,12 +281,183 @@ struct stats dx_show_entries(struct dx_h
  }
  #endif /* DX_DEBUG */
  
@@ -271,7 +273,7 @@ Index: iam/fs/ext3/namei.c
  
        struct iam_descr *param;
        struct iam_frame *frame;
-@@ -255,20 +464,19 @@ int dx_lookup(struct iam_path *path)
+@@ -255,20 +466,19 @@ int dx_lookup(struct iam_path *path)
        param = iam_path_descr(path);
        c = path->ip_container;
        
@@ -302,7 +304,7 @@ Index: iam/fs/ext3/namei.c
                if (err != 0)
                        break;
  
-@@ -283,53 +491,83 @@ int dx_lookup(struct iam_path *path)
+@@ -283,53 +493,83 @@ int dx_lookup(struct iam_path *path)
                        break;
  
                assert_inv(dx_node_check(path, frame));
@@ -425,7 +427,7 @@ Index: iam/fs/ext3/namei.c
  /*
   * Probe for a directory leaf block to search.
   *
-@@ -339,7 +577,7 @@ int dx_lookup(struct iam_path *path)
+@@ -339,7 +579,7 @@ int dx_lookup(struct iam_path *path)
   * check for this error code, and make sure it never gets reflected
   * back to userspace.
   */
@@ -434,7 +436,7 @@ Index: iam/fs/ext3/namei.c
                    struct dx_hash_info *hinfo, struct iam_path *path)
  {
        int err;
-@@ -347,7 +585,7 @@ static int dx_probe(struct dentry *dentr
+@@ -347,7 +587,7 @@ static int dx_probe(struct dentry *dentr
        
        assert_corr(path->ip_data != NULL);
        ipc = container_of(path->ip_data, struct iam_path_compat, ipc_descr);
@@ -443,7 +445,7 @@ Index: iam/fs/ext3/namei.c
        ipc->ipc_hinfo = hinfo;
  
        assert_corr(dx_index_is_compat(path));
-@@ -356,6 +594,7 @@ static int dx_probe(struct dentry *dentr
+@@ -356,6 +596,7 @@ static int dx_probe(struct dentry *dentr
        return err;
  }
  
@@ -451,7 +453,7 @@ Index: iam/fs/ext3/namei.c
  /*
   * This function increments the frame pointer to search the next leaf
   * block, and reads in the necessary intervening nodes if the search
-@@ -391,10 +630,13 @@ static int ext3_htree_advance(struct ino
+@@ -391,10 +632,13 @@ static int ext3_htree_advance(struct ino
         * nodes need to be read.
         */
        while (1) {
@@ -466,7 +468,7 @@ Index: iam/fs/ext3/namei.c
                if (p == path->ip_frames)
                        return 0;
                num_frames++;
-@@ -409,7 +651,7 @@ static int ext3_htree_advance(struct ino
+@@ -409,7 +653,7 @@ static int ext3_htree_advance(struct ino
         * If the hash is 1, then continue only if the next page has a
         * continuation hash of any value.  This is used for readdir
         * handling.  Otherwise, check to see if the hash matches the
@@ -475,7 +477,7 @@ Index: iam/fs/ext3/namei.c
         * there's no point to read in the successive index pages.
         */
                iam_get_ikey(path, p->at, (struct iam_ikey *)&bhash);
-@@ -425,25 +667,96 @@ static int ext3_htree_advance(struct ino
+@@ -425,25 +669,96 @@ static int ext3_htree_advance(struct ino
         * block so no check is necessary
         */
        while (num_frames--) {
@@ -577,7 +579,7 @@ Index: iam/fs/ext3/namei.c
  }
  
  int ext3_htree_next_block(struct inode *dir, __u32 hash,
-@@ -657,6 +970,15 @@ void iam_insert_key(struct iam_path *pat
+@@ -657,6 +972,15 @@ void iam_insert_key(struct iam_path *pat
        dx_set_ikey(path, new, key);
        dx_set_block(path, new, ptr);
        dx_set_count(entries, count + 1);
@@ -593,7 +595,7 @@ Index: iam/fs/ext3/namei.c
  }
  
  void dx_insert_block(struct iam_path *path, struct iam_frame *frame,
-@@ -882,7 +1204,7 @@ static struct buffer_head * ext3_dx_find
+@@ -882,7 +1206,7 @@ static struct buffer_head * ext3_dx_find
        sb = dir->i_sb;
        /* NFS may look up ".." - look at dx_root directory block */
        if (namelen > 2 || name[0] != '.'||(name[1] != '.' && name[1] != '\0')){
@@ -602,7 +604,7 @@ Index: iam/fs/ext3/namei.c
                if (*err != 0)
                        return NULL;
        } else {
-@@ -1114,7 +1436,7 @@ struct ext3_dir_entry_2 *move_entries(st
+@@ -1114,7 +1438,7 @@ struct ext3_dir_entry_2 *move_entries(st
        hash2 = map[split].hash;
        continued = hash2 == map[split - 1].hash;
        dxtrace(printk("Split block %i at %x, %i/%i\n",
@@ -611,7 +613,7 @@ Index: iam/fs/ext3/namei.c
  
        /* Fancy dance to stay within two buffers */
        de2 = dx_move_dirents(data1, data2, map + split, count - split);
-@@ -1484,16 +1806,38 @@ static int shift_entries(struct iam_path
+@@ -1484,16 +1808,38 @@ static int shift_entries(struct iam_path
               (char *) iam_entry_shift(path, entries, count1),
               count2 * iam_entry_size(path));
  
@@ -653,7 +655,7 @@ Index: iam/fs/ext3/namei.c
  {
  
        struct iam_entry *entries;   /* old block contents */
-@@ -1501,6 +1845,8 @@ int split_index_node(handle_t *handle, s
+@@ -1501,6 +1847,8 @@ int split_index_node(handle_t *handle, s
        struct iam_frame *frame, *safe;
        struct buffer_head *bh_new[DX_MAX_TREE_HEIGHT] = {0};
        u32 newblock[DX_MAX_TREE_HEIGHT] = {0};
@@ -662,7 +664,7 @@ Index: iam/fs/ext3/namei.c
        struct inode *dir = iam_path_obj(path);
        struct iam_descr *descr;
        int nr_splet;
-@@ -1523,12 +1869,14 @@ int split_index_node(handle_t *handle, s
+@@ -1523,12 +1871,14 @@ int split_index_node(handle_t *handle, s
         *   - first allocate all necessary blocks
         *
         *   - insert pointers into them atomically.
@@ -681,7 +683,7 @@ Index: iam/fs/ext3/namei.c
        dxtrace(printk("using %u of %u node entries\n",
                       dx_get_count(entries), dx_get_limit(entries)));
  
-@@ -1536,6 +1884,7 @@ int split_index_node(handle_t *handle, s
+@@ -1536,6 +1886,7 @@ int split_index_node(handle_t *handle, s
        for (nr_splet = 0; frame >= path->ip_frames &&
             dx_get_count(frame->entries) == dx_get_limit(frame->entries);
             --frame, ++nr_splet) {
@@ -689,7 +691,7 @@ Index: iam/fs/ext3/namei.c
                if (nr_splet == DX_MAX_TREE_HEIGHT) {
                        ext3_warning(dir->i_sb, __FUNCTION__,
                                     "Directory index full!\n");
-@@ -1545,14 +1894,53 @@ int split_index_node(handle_t *handle, s
+@@ -1545,14 +1896,53 @@ int split_index_node(handle_t *handle, s
        }
  
        safe = frame;
@@ -744,7 +746,7 @@ Index: iam/fs/ext3/namei.c
                BUFFER_TRACE(frame->bh, "get_write_access");
                err = ext3_journal_get_write_access(handle, frame->bh);
                if (err)
-@@ -1560,6 +1948,7 @@ int split_index_node(handle_t *handle, s
+@@ -1560,6 +1950,7 @@ int split_index_node(handle_t *handle, s
        }
        /* Add "safe" node to transaction too */
        if (safe + 1 != path->ip_frames) {
@@ -752,7 +754,7 @@ Index: iam/fs/ext3/namei.c
                err = ext3_journal_get_write_access(handle, safe->bh);
                if (err)
                        goto journal_error;
-@@ -1596,16 +1985,21 @@ int split_index_node(handle_t *handle, s
+@@ -1596,16 +1987,21 @@ int split_index_node(handle_t *handle, s
  
                        assert_corr(i == 0);
  
@@ -774,7 +776,7 @@ Index: iam/fs/ext3/namei.c
                        /* Shift frames in the path */
                        memmove(frames + 2, frames + 1,
                                (sizeof path->ip_frames) - 2 * sizeof frames[0]);
-@@ -1613,18 +2007,22 @@ int split_index_node(handle_t *handle, s
+@@ -1613,18 +2009,22 @@ int split_index_node(handle_t *handle, s
                        frames[1].at = iam_entry_shift(path, entries2, idx);
                        frames[1].entries = entries = entries2;
                        frames[1].bh = bh2;
@@ -797,7 +799,7 @@ Index: iam/fs/ext3/namei.c
                        count = shift_entries(path, frame, count,
                                              entries, entries2, newblock[i]);
                        /* Which index block gets the new entry? */
-@@ -1635,22 +2033,29 @@ int split_index_node(handle_t *handle, s
+@@ -1635,22 +2035,29 @@ int split_index_node(handle_t *handle, s
                                                            idx - count + d);
                                frame->entries = entries = entries2;
                                swap(frame->bh, bh2);
@@ -827,7 +829,7 @@ Index: iam/fs/ext3/namei.c
                err = ext3_journal_dirty_metadata(handle, bh);
                if (err)
                        goto journal_error;
-@@ -1661,6 +2066,9 @@ int split_index_node(handle_t *handle, s
+@@ -1661,6 +2068,9 @@ int split_index_node(handle_t *handle, s
                assert_corr(dx_get_count(path->ip_frame->entries) <
                            dx_get_limit(path->ip_frame->entries));
                }
@@ -837,7 +839,7 @@ Index: iam/fs/ext3/namei.c
        if (nr_splet > 0) {
                /*
                 * Log ->i_size modification.
-@@ -1674,6 +2082,10 @@ journal_error:
+@@ -1674,6 +2084,10 @@ journal_error:
        ext3_std_error(dir->i_sb, err);
  
  cleanup:
@@ -848,7 +850,7 @@ Index: iam/fs/ext3/namei.c
        for (i = 0; i < ARRAY_SIZE(bh_new); ++i) {
                if (bh_new[i] != NULL)
                        brelse(bh_new[i]);
-@@ -1695,18 +2107,18 @@ static int ext3_dx_add_entry(handle_t *h
+@@ -1695,18 +2109,18 @@ static int ext3_dx_add_entry(handle_t *h
        struct buffer_head * bh = NULL;
        struct inode *dir = dentry->d_parent->d_inode;
        struct ext3_dir_entry_2 *de;
@@ -869,7 +871,7 @@ Index: iam/fs/ext3/namei.c
        isize = dir->i_size;
  
        err = param->id_ops->id_node_read(path->ip_container,
-@@ -1726,7 +2138,7 @@ static int ext3_dx_add_entry(handle_t *h
+@@ -1726,7 +2140,7 @@ static int ext3_dx_add_entry(handle_t *h
                goto cleanup;
        }
        
@@ -878,7 +880,7 @@ Index: iam/fs/ext3/namei.c
        if (err)
                goto cleanup;   
  
-@@ -1736,12 +2148,14 @@ static int ext3_dx_add_entry(handle_t *h
+@@ -1736,12 +2150,14 @@ static int ext3_dx_add_entry(handle_t *h
                goto cleanup;
  
        assert_inv(dx_node_check(path, frame));