ldiskfs/kernel_patches/patches/ext4-osd-iop-common-rhel6.patch

   1 Index: linux-stage/fs/ext4/ext4.h
   2 ===================================================================
   3 --- linux-stage.orig/fs/ext4/ext4.h
   4 +++ linux-stage/fs/ext4/ext4.h
   5 @@ -1599,6 +1599,19 @@ extern int ext4_orphan_add(handle_t *, s
   6  extern int ext4_orphan_del(handle_t *, struct inode *);
   7  extern int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash,
   8                                 __u32 start_minor_hash, __u32 *next_hash);
   9 +extern struct inode *ext4_create_inode(handle_t *handle,
  10 +                                      struct inode * dir, int mode);
  11 +extern int ext4_add_entry(handle_t *handle, struct dentry *dentry,
  12 +                         struct inode *inode);
  13 +extern int ext4_delete_entry(handle_t *handle, struct inode * dir,
  14 +                            struct ext4_dir_entry_2 * de_del,
  15 +                            struct buffer_head * bh);
  16 +extern struct buffer_head * ext4_find_entry(struct inode *dir,
  17 +                                           const struct qstr *d_name,
  18 +                                           struct ext4_dir_entry_2 ** res_dir);
  19 +#define ll_ext4_find_entry(inode, dentry, res_dir) ext4_find_entry(inode, &(dentry)->d_name, res_dir)
  20 +extern int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
  21 +                              struct inode *inode);
  22
  23  /* resize.c */
  24  extern int ext4_group_add(struct super_block *sb,
  25 Index: linux-stage/fs/ext4/namei.c
  26 ===================================================================
  27 --- linux-stage.orig/fs/ext4/namei.c
  28 +++ linux-stage/fs/ext4/namei.c
  29 @@ -24,6 +24,7 @@
  30   *     Theodore Ts'o, 2002
  31   */
  32
  33 +#include <linux/module.h>
  34  #include <linux/fs.h>
  35  #include <linux/pagemap.h>
  36  #include <linux/jbd2.h>
  37 @@ -873,9 +874,9 @@ static inline int search_dirblock(struct
  38   * The returned buffer_head has ->b_count elevated.  The caller is expected
  39   * to brelse() it when appropriate.
  40   */
  41 -static struct buffer_head * ext4_find_entry (struct inode *dir,
  42 -                                       const struct qstr *d_name,
  43 -                                       struct ext4_dir_entry_2 ** res_dir)
  44 +struct buffer_head * ext4_find_entry(struct inode *dir,
  45 +                                     const struct qstr *d_name,
  46 +                                     struct ext4_dir_entry_2 ** res_dir)
  47  {
  48         struct super_block *sb;
  49         struct buffer_head *bh_use[NAMEI_RA_SIZE];
  50 @@ -981,6 +982,7 @@ cleanup_and_exit:
  51                 brelse(bh_use[ra_ptr]);
  52         return ret;
  53  }
  54 +EXPORT_SYMBOL(ext4_find_entry);
  55
  56  static struct buffer_head * ext4_dx_find_entry(struct inode *dir, const struct qstr *d_name,
  57                        struct ext4_dir_entry_2 **res_dir, int *err)
  58 @@ -1503,8 +1505,8 @@ static int make_indexed_dir(handle_t *ha
  59   * may not sleep between calling this and putting something into
  60   * the entry, as someone else might have used it while you slept.
  61   */
  62 -static int ext4_add_entry(handle_t *handle, struct dentry *dentry,
  63 -                         struct inode *inode)
  64 +int ext4_add_entry(handle_t *handle, struct dentry *dentry,
  65 +                  struct inode *inode)
  66  {
  67         struct inode *dir = dentry->d_parent->d_inode;
  68         struct buffer_head *bh;
  69 @@ -1553,6 +1555,7 @@ static int ext4_add_entry(handle_t *hand
  70         brelse(bh);
  71         return retval;
  72  }
  73 +EXPORT_SYMBOL(ext4_add_entry);
  74
  75  /*
  76   * Returns 0 for success, or a negative error value
  77 @@ -1692,10 +1695,10 @@ cleanup:
  78   * ext4_delete_entry deletes a directory entry by merging it with the
  79   * previous entry
  80   */
  81 -static int ext4_delete_entry(handle_t *handle,
  82 -                            struct inode *dir,
  83 -                            struct ext4_dir_entry_2 *de_del,
  84 -                            struct buffer_head *bh)
  85 +int ext4_delete_entry(handle_t *handle,
  86 +                     struct inode *dir,
  87 +                     struct ext4_dir_entry_2 *de_del,
  88 +                     struct buffer_head *bh)
  89  {
  90         struct ext4_dir_entry_2 *de, *pde;
  91         unsigned int blocksize = dir->i_sb->s_blocksize;
  92 @@ -1730,7 +1733,7 @@ static int ext4_delete_entry(handle_t *h
  93         }
  94         return -ENOENT;
  95  }
  96 -
  97 +EXPORT_SYMBOL(ext4_delete_entry);
  98  /*
  99   * DIR_NLINK feature is set if 1) nlinks > EXT4_LINK_MAX or 2) nlinks == 2,
 100   * since this indicates that nlinks count was previously 1.
 101 @@ -1795,6 +1798,27 @@ static unsigned ext4_dentry_goal(struct
 102         return inum;
 103  }
 104
 105 +struct inode * ext4_create_inode(handle_t *handle, struct inode * dir, int mode)
 106 +{
 107 +       struct inode *inode;
 108 +
 109 +       inode = ext4_new_inode(handle, dir, mode, 0, EXT4_SB(dir->i_sb)->s_inode_goal);
 110 +       if (!IS_ERR(inode)) {
 111 +               if (S_ISCHR(mode) || S_ISBLK(mode) || S_ISFIFO(mode)) {
 112 +#ifdef CONFIG_LDISKFS_FS_XATTR
 113 +                       inode->i_op = &ext4_special_inode_operations;
 114 +#endif
 115 +               } else {
 116 +                       inode->i_op = &ext4_file_inode_operations;
 117 +                       inode->i_fop = &ext4_file_operations;
 118 +                       ext4_set_aops(inode);
 119 +               }
 120 +               unlock_new_inode(inode);
 121 +       }
 122 +       return inode;
 123 +}
 124 +EXPORT_SYMBOL(ext4_create_inode);
 125 +
 126  /*
 127   * By the time this is called, we already have created
 128   * the directory cache entry for the new file, but it
 129 @@ -1871,40 +1895,33 @@ retry:
 130         return err;
 131  }
 132
 133 -static int ext4_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 134 +/* Initialize @inode as a subdirectory of @dir, and add the
 135 + * "." and ".." entries into the first directory block. */
 136 +int ext4_add_dot_dotdot(handle_t *handle, struct inode * dir,
 137 +                       struct inode *inode)
 138  {
 139 -       handle_t *handle;
 140 -       struct inode *inode;
 141 -       struct buffer_head *dir_block;
 142 -       struct ext4_dir_entry_2 *de;
 143 +       struct buffer_head * dir_block;
 144 +       struct ext4_dir_entry_2 * de;
 145         unsigned int blocksize = dir->i_sb->s_blocksize;
 146 -       int err, retries = 0;
 147 -
 148 -       if (EXT4_DIR_LINK_MAX(dir))
 149 -               return -EMLINK;
 150 +       int err = 0;
 151
 152 -retry:
 153 -       handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) +
 154 -                                       EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3 +
 155 -                                       EXT4_MAXQUOTAS_INIT_BLOCKS(dir->i_sb));
 156         if (IS_ERR(handle))
 157                 return PTR_ERR(handle);
 158
 159         if (IS_DIRSYNC(dir))
 160                 ext4_handle_sync(handle);
 161
 162 -       inode = ext4_new_inode(handle, dir, S_IFDIR | mode,
 163 -                              &dentry->d_name, ext4_dentry_goal(dir->i_sb, dentry));
 164 -       err = PTR_ERR(inode);
 165 -       if (IS_ERR(inode))
 166 -               goto out_stop;
 167
 168         inode->i_op = &ext4_dir_inode_operations;
 169         inode->i_fop = &ext4_dir_operations;
 170         inode->i_size = EXT4_I(inode)->i_disksize = inode->i_sb->s_blocksize;
 171         dir_block = ext4_bread(handle, inode, 0, 1, &err);
 172 -       if (!dir_block)
 173 -               goto out_clear_inode;
 174 +       if (!dir_block) {
 175 +               clear_nlink(inode);
 176 +               ext4_mark_inode_dirty(handle, inode);
 177 +               iput (inode);
 178 +               goto get_out;
 179 +       }
 180         BUFFER_TRACE(dir_block, "get_write_access");
 181         ext4_journal_get_write_access(handle, dir_block);
 182         de = (struct ext4_dir_entry_2 *) dir_block->b_data;
 183 @@ -1926,9 +1943,45 @@ retry:
 184         ext4_handle_dirty_metadata(handle, dir, dir_block);
 185         brelse(dir_block);
 186         ext4_mark_inode_dirty(handle, inode);
 187 +get_out:
 188 +       return err;
 189 +}
 190 +EXPORT_SYMBOL(ext4_add_dot_dotdot);
 191 +
 192 +
 193 +static int ext4_mkdir(struct inode *dir, struct dentry *dentry, int mode)
 194 +{
 195 +       handle_t *handle;
 196 +       struct inode *inode;
 197 +       int err, retries = 0;
 198 +
 199 +       if (EXT4_DIR_LINK_MAX(dir))
 200 +               return -EMLINK;
 201 +
 202 +retry:
 203 +       handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) +
 204 +                                       EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3 +
 205 +                                       2*EXT4_QUOTA_INIT_BLOCKS(dir->i_sb));
 206 +       if (IS_ERR(handle))
 207 +               return PTR_ERR(handle);
 208 +
 209 +       if (IS_DIRSYNC(dir))
 210 +               handle->h_sync = 1;
 211 +
 212 +       inode = ext4_new_inode(handle, dir, S_IFDIR | mode,
 213 +                              &dentry->d_name, ext4_dentry_goal(dir->i_sb, dentry));
 214 +       err = PTR_ERR(inode);
 215 +       if (IS_ERR(inode))
 216 +               goto out_stop;
 217 +
 218 +       err = ext4_add_dot_dotdot(handle, dir, inode);
 219 +       if (err) {
 220 +               unlock_new_inode(inode);
 221 +               goto out_stop;
 222 +       }
 223 +
 224         err = ext4_add_entry(handle, dentry, inode);
 225         if (err) {
 226 -out_clear_inode:
 227                 clear_nlink(inode);
 228                 unlock_new_inode(inode);
 229                 ext4_mark_inode_dirty(handle, inode);