ldiskfs/kernel_patches/patches/ext3-osd-iop-common.patch

   1 diff -rupN linux-2.6.18-128.1.6_1/fs/ext3/namei.c linux-2.6.18-128.1.6_2/fs/ext3/namei.c
   2 --- linux-2.6.18-128.1.6_1/fs/ext3/namei.c      2009-08-13 19:07:07.000000000 +0530
   3 +++ linux-2.6.18-128.1.6_2/fs/ext3/namei.c      2009-08-13 19:10:43.000000000 +0530
   4 @@ -24,6 +24,7 @@
   5   *     Theodore Ts'o, 2002
   6   */
   7
   8 +#include <linux/module.h>
   9  #include <linux/fs.h>
  10  #include <linux/pagemap.h>
  11  #include <linux/jbd.h>
  12 @@ -841,7 +842,7 @@ static inline int search_dirblock(struct
  13   * The returned buffer_head has ->b_count elevated.  The caller is expected
  14   * to brelse() it when appropriate.
  15   */
  16 -static struct buffer_head * ext3_find_entry (struct dentry *dentry,
  17 +struct buffer_head * ext3_find_entry (struct dentry *dentry,
  18                                         struct ext3_dir_entry_2 ** res_dir)
  19  {
  20         struct super_block * sb;
  21 @@ -953,6 +954,7 @@ cleanup_and_exit:
  22                 brelse (bh_use[ra_ptr]);
  23         return ret;
  24  }
  25 +EXPORT_SYMBOL(ext3_find_entry);
  26
  27  #ifdef CONFIG_EXT3_INDEX
  28  static struct buffer_head * ext3_dx_find_entry(struct dentry *dentry,
  29 @@ -1489,7 +1491,7 @@ static int make_indexed_dir(handle_t *ha
  30   * may not sleep between calling this and putting something into
  31   * the entry, as someone else might have used it while you slept.
  32   */
  33 -static int ext3_add_entry (handle_t *handle, struct dentry *dentry,
  34 +int ext3_add_entry (handle_t *handle, struct dentry *dentry,
  35         struct inode *inode)
  36  {
  37         struct inode *dir = dentry->d_parent->d_inode;
  38 @@ -1542,6 +1544,7 @@ static int ext3_add_entry (handle_t *han
  39         de->rec_len = cpu_to_le16(blocksize);
  40         return add_dirent_to_buf(handle, dentry, inode, de, bh);
  41  }
  42 +EXPORT_SYMBOL(ext3_add_entry);
  43
  44  #ifdef CONFIG_EXT3_INDEX
  45  /*
  46 @@ -1684,10 +1687,10 @@ cleanup:
  47   * ext3_delete_entry deletes a directory entry by merging it with the
  48   * previous entry
  49   */
  50 -static int ext3_delete_entry (handle_t *handle,
  51 -                             struct inode * dir,
  52 -                             struct ext3_dir_entry_2 * de_del,
  53 -                             struct buffer_head * bh)
  54 +int ext3_delete_entry (handle_t *handle,
  55 +                       struct inode * dir,
  56 +                       struct ext3_dir_entry_2 * de_del,
  57 +                       struct buffer_head * bh)
  58  {
  59         struct ext3_dir_entry_2 * de, * pde;
  60         int i;
  61 @@ -1719,6 +1722,7 @@ static int ext3_delete_entry (handle_t *
  62         }
  63         return -ENOENT;
  64  }
  65 +EXPORT_SYMBOL(ext3_delete_entry);
  66
  67  /*
  68   * ext3_mark_inode_dirty is somewhat expensive, so unlike ext2 we
  69 @@ -1774,6 +1778,26 @@ static struct inode * ext3_new_inode_wan
  70         return ext3_new_inode(handle, dir, mode, inum);
  71  }
  72
  73 +struct inode * ext3_create_inode(handle_t *handle, struct inode * dir, int mode)
  74 +{
  75 +       struct inode *inode;
  76 +
  77 +       inode = ext3_new_inode(handle, dir, mode, 0);
  78 +       if (!IS_ERR(inode)) {
  79 +               if (S_ISCHR(mode) || S_ISBLK(mode) || S_ISFIFO(mode)) {
  80 +#ifdef CONFIG_LDISKFS_FS_XATTR
  81 +                       inode->i_op = &ext3_special_inode_operations;
  82 +#endif
  83 +               } else {
  84 +                       inode->i_op = &ext3_file_inode_operations;
  85 +                       inode->i_fop = &ext3_file_operations;
  86 +                       ext3_set_aops(inode);
  87 +               }
  88 +       }
  89 +       return inode;
  90 +}
  91 +EXPORT_SYMBOL(ext3_create_inode);
  92 +
  93  /*
  94   * By the time this is called, we already have created
  95   * the directory cache entry for the new file, but it
  96 @@ -1848,42 +1872,28 @@ retry:
  97         return err;
  98  }
  99
 100 -static int ext3_mkdir(struct inode * dir, struct dentry * dentry, int mode)
 101 +/* Initialize @inode as a subdirectory of @dir, and add the
 102 + * "." and ".." entries into the first directory block. */
 103 +int ext3_add_dot_dotdot(handle_t *handle, struct inode * dir,
 104 +                        struct inode *inode)
 105  {
 106 -       handle_t *handle;
 107 -       struct inode * inode;
 108         struct buffer_head * dir_block;
 109         struct ext3_dir_entry_2 * de;
 110 -       int err, retries = 0;
 111 -
 112 -       if (EXT3_DIR_LINK_MAX(dir))
 113 -               return -EMLINK;
 114 +       int err = 0;
 115
 116 -retry:
 117 -       handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
 118 -                                       EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 +
 119 -                                       2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb));
 120         if (IS_ERR(handle))
 121                 return PTR_ERR(handle);
 122
 123         if (IS_DIRSYNC(dir))
 124                 handle->h_sync = 1;
 125
 126 -       inode = ext3_new_inode_wantedi (handle, dir, S_IFDIR | mode, dentry);
 127 -       err = PTR_ERR(inode);
 128 -       if (IS_ERR(inode))
 129 -               goto out_stop;
 130 -
 131         inode->i_op = &ext3_dir_inode_operations;
 132         inode->i_fop = &ext3_dir_operations;
 133         inode->i_size = EXT3_I(inode)->i_disksize = inode->i_sb->s_blocksize;
 134         dir_block = ext3_bread (handle, inode, 0, 1, &err);
 135 -       if (!dir_block) {
 136 -               drop_nlink(inode); /* is this nlink == 0? */
 137 -               ext3_mark_inode_dirty(handle, inode);
 138 -               iput (inode);
 139 -               goto out_stop;
 140 -       }
 141 +       if (!dir_block)
 142 +               goto get_out;
 143 +
 144         BUFFER_TRACE(dir_block, "get_write_access");
 145         ext3_journal_get_write_access(handle, dir_block);
 146         de = (struct ext3_dir_entry_2 *) dir_block->b_data;
 147 @@ -1904,6 +1914,45 @@ retry:
 148         ext3_journal_dirty_metadata(handle, dir_block);
 149         brelse (dir_block);
 150         ext3_mark_inode_dirty(handle, inode);
 151 +
 152 +get_out:
 153 +       return err;
 154 +
 155 +}
 156 +EXPORT_SYMBOL(ext3_add_dot_dotdot);
 157 +
 158 +static int ext3_mkdir(struct inode * dir, struct dentry * dentry, int mode)
 159 +{
 160 +       handle_t *handle;
 161 +       struct inode * inode;
 162 +       int err, retries = 0;
 163 +
 164 +       if (EXT3_DIR_LINK_MAX(dir))
 165 +               return -EMLINK;
 166 +
 167 +retry:
 168 +       handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS(dir->i_sb) +
 169 +                                       EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3 +
 170 +                                       2*EXT3_QUOTA_INIT_BLOCKS(dir->i_sb));
 171 +       if (IS_ERR(handle))
 172 +               return PTR_ERR(handle);
 173 +
 174 +       if (IS_DIRSYNC(dir))
 175 +               handle->h_sync = 1;
 176 +
 177 +       inode = ext3_new_inode_wantedi (handle, dir, S_IFDIR | mode, dentry);
 178 +       err = PTR_ERR(inode);
 179 +       if (IS_ERR(inode))
 180 +               goto out_stop;
 181 +
 182 +       err = ext3_add_dot_dotdot(handle, dir, inode);
 183 +       if (err) {
 184 +               inode->i_nlink = 0;
 185 +               ext3_mark_inode_dirty(handle, inode);
 186 +               iput (inode);
 187 +               goto out_stop;
 188 +       }
 189 +
 190         err = ext3_add_entry (handle, dentry, inode);
 191         if (err) {
 192                 inode->i_nlink = 0;
 193 diff -rupN linux-2.6.18-128.1.6_1/include/linux/ext3_fs.h linux-2.6.18-128.1.6_2/include/linux/ext3_fs.h
 194 --- linux-2.6.18-128.1.6_1/include/linux/ext3_fs.h      2009-08-13 19:07:07.000000000 +0530
 195 +++ linux-2.6.18-128.1.6_2/include/linux/ext3_fs.h      2009-08-13 19:14:07.000000000 +0530
 196 @@ -1076,6 +1076,10 @@ extern int ext3_group_extend(struct supe
 197                                 ext3_fsblk_t n_blocks_count);
 198
 199  /* super.c */
 200 +extern int ext3_xattr_set_handle(handle_t *handle, struct inode *inode,
 201 +                                int name_index, const char *name,
 202 +                                const void *value, size_t value_len,
 203 +                                int flags);
 204  extern struct proc_dir_entry *proc_root_ext3;
 205  extern int __init init_ext3_proc(void);
 206  extern void exit_ext3_proc(void);
 207 @@ -1107,6 +1111,20 @@ extern struct inode_operations ext3_file
 208  extern const struct file_operations ext3_file_operations;
 209
 210  /* namei.c */
 211 +extern struct inode *ext3_create_inode(handle_t *handle,
 212 +                                      struct inode * dir, int mode);
 213 +extern int ext3_add_entry(handle_t *handle, struct dentry *dentry,
 214 +                         struct inode *inode);
 215 +extern int ext3_delete_entry(handle_t *handle,
 216 +                            struct inode * dir,
 217 +                            struct ext3_dir_entry_2 * de_del,
 218 +                            struct buffer_head * bh);
 219 +extern struct buffer_head * ext3_find_entry(struct dentry *dentry,
 220 +                                           struct ext3_dir_entry_2
 221 +                                           ** res_dir);
 222 +#define ll_ext3_find_entry(inode, dentry, res_dir) ext3_find_entry(dentry, res_dir)
 223 +extern int ext3_add_dot_dotdot(handle_t *handle, struct inode *dir,
 224 +                              struct inode *inode);
 225  extern struct inode_operations ext3_dir_inode_operations;
 226  extern struct inode_operations ext3_special_inode_operations;
 227
 228