3 @@ -1778,6 +1778,19 @@ extern int ext4_orphan_add(handle_t *, s
4 extern int ext4_orphan_del(handle_t *, struct inode *);
5 extern int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash,
6 __u32 start_minor_hash, __u32 *next_hash);
7 +extern struct inode *ext4_create_inode(handle_t *handle,
8 + struct inode * dir, int mode);
9 +extern int ext4_add_entry(handle_t *handle, struct dentry *dentry,
10 + struct inode *inode);
11 +extern int ext4_delete_entry(handle_t *handle, struct inode * dir,
12 + struct ext4_dir_entry_2 * de_del,
13 + struct buffer_head * bh);
14 +extern struct buffer_head * ext4_find_entry(struct inode *dir,
15 + const struct qstr *d_name,
16 + struct ext4_dir_entry_2 ** res_dir);
17 +#define ll_ext4_find_entry(inode, dentry, res_dir) ext4_find_entry(inode, &(dentry)->d_name, res_dir)
18 +extern int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir,
19 + struct inode *inode);
22 extern int ext4_group_add(struct super_block *sb,
29 +#include <linux/module.h>
31 #include <linux/pagemap.h>
32 #include <linux/jbd2.h>
33 @@ -873,9 +874,9 @@ static inline int search_dirblock(struct
34 * The returned buffer_head has ->b_count elevated. The caller is expected
35 * to brelse() it when appropriate.
37 -static struct buffer_head * ext4_find_entry (struct inode *dir,
38 - const struct qstr *d_name,
39 - struct ext4_dir_entry_2 ** res_dir)
40 +struct buffer_head * ext4_find_entry(struct inode *dir,
41 + const struct qstr *d_name,
42 + struct ext4_dir_entry_2 ** res_dir)
44 struct super_block *sb;
45 struct buffer_head *bh_use[NAMEI_RA_SIZE];
46 @@ -981,6 +982,7 @@ cleanup_and_exit:
47 brelse(bh_use[ra_ptr]);
50 +EXPORT_SYMBOL(ext4_find_entry);
52 static struct buffer_head * ext4_dx_find_entry(struct inode *dir, const struct qstr *d_name,
53 struct ext4_dir_entry_2 **res_dir, int *err)
54 @@ -1515,8 +1517,8 @@ static int make_indexed_dir(handle_t *ha
55 * may not sleep between calling this and putting something into
56 * the entry, as someone else might have used it while you slept.
58 -static int ext4_add_entry(handle_t *handle, struct dentry *dentry,
59 - struct inode *inode)
60 +int ext4_add_entry(handle_t *handle, struct dentry *dentry,
61 + struct inode *inode)
63 struct inode *dir = dentry->d_parent->d_inode;
64 struct buffer_head *bh;
65 @@ -1565,6 +1567,7 @@ static int ext4_add_entry(handle_t *hand
69 +EXPORT_SYMBOL(ext4_add_entry);
72 * Returns 0 for success, or a negative error value
73 @@ -1704,10 +1707,10 @@ cleanup:
74 * ext4_delete_entry deletes a directory entry by merging it with the
77 -static int ext4_delete_entry(handle_t *handle,
79 - struct ext4_dir_entry_2 *de_del,
80 - struct buffer_head *bh)
81 +int ext4_delete_entry(handle_t *handle,
83 + struct ext4_dir_entry_2 *de_del,
84 + struct buffer_head *bh)
86 struct ext4_dir_entry_2 *de, *pde;
87 unsigned int blocksize = dir->i_sb->s_blocksize;
88 @@ -1742,7 +1745,7 @@ static int ext4_delete_entry(handle_t *h
93 +EXPORT_SYMBOL(ext4_delete_entry);
95 * DIR_NLINK feature is set if 1) nlinks > EXT4_LINK_MAX or 2) nlinks == 2,
96 * since this indicates that nlinks count was previously 1.
97 @@ -1806,6 +1809,27 @@ static unsigned ext4_dentry_goal(struct
101 +struct inode * ext4_create_inode(handle_t *handle, struct inode * dir, int mode)
103 + struct inode *inode;
105 + inode = ext4_new_inode(handle, dir, mode, 0, EXT4_SB(dir->i_sb)->s_inode_goal);
106 + if (!IS_ERR(inode)) {
107 + if (S_ISCHR(mode) || S_ISBLK(mode) || S_ISFIFO(mode)) {
108 +#ifdef CONFIG_LDISKFS_FS_XATTR
109 + inode->i_op = &ext4_special_inode_operations;
112 + inode->i_op = &ext4_file_inode_operations;
113 + inode->i_fop = &ext4_file_operations;
114 + ext4_set_aops(inode);
116 + unlock_new_inode(inode);
120 +EXPORT_SYMBOL(ext4_create_inode);
123 * By the time this is called, we already have created
124 * the directory cache entry for the new file, but it
125 @@ -1882,44 +1906,32 @@ retry:
129 -static int ext4_mkdir(struct inode *dir, struct dentry *dentry, int mode)
130 +/* Initialize @inode as a subdirectory of @dir, and add the
131 + * "." and ".." entries into the first directory block. */
132 +int ext4_add_dot_dotdot(handle_t *handle, struct inode * dir,
133 + struct inode *inode)
136 - struct inode *inode;
137 - struct buffer_head *dir_block = NULL;
138 - struct ext4_dir_entry_2 *de;
139 + struct buffer_head * dir_block;
140 + struct ext4_dir_entry_2 * de;
141 unsigned int blocksize = dir->i_sb->s_blocksize;
142 - int err, retries = 0;
145 - if (EXT4_DIR_LINK_MAX(dir))
149 - handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) +
150 - EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3 +
151 - EXT4_MAXQUOTAS_INIT_BLOCKS(dir->i_sb));
153 return PTR_ERR(handle);
156 ext4_handle_sync(handle);
158 - inode = ext4_new_inode(handle, dir, S_IFDIR | mode,
159 - &dentry->d_name, ext4_dentry_goal(dir->i_sb, dentry));
160 - err = PTR_ERR(inode);
164 inode->i_op = &ext4_dir_inode_operations;
165 inode->i_fop = &ext4_dir_operations;
166 inode->i_size = EXT4_I(inode)->i_disksize = inode->i_sb->s_blocksize;
167 dir_block = ext4_bread(handle, inode, 0, 1, &err);
169 - goto out_clear_inode;
171 BUFFER_TRACE(dir_block, "get_write_access");
172 err = ext4_journal_get_write_access(handle, dir_block);
174 - goto out_clear_inode;
176 de = (struct ext4_dir_entry_2 *) dir_block->b_data;
177 de->inode = cpu_to_le32(inode->i_ino);
179 @@ -1938,18 +1950,47 @@ retry:
180 BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata");
181 err = ext4_handle_dirty_metadata(handle, inode, dir_block);
183 - goto out_clear_inode;
185 err = ext4_mark_inode_dirty(handle, inode);
187 - err = ext4_add_entry(handle, dentry, inode);
190 - clear_nlink(inode);
191 - unlock_new_inode(inode);
192 - ext4_mark_inode_dirty(handle, inode);
198 +EXPORT_SYMBOL(ext4_add_dot_dotdot);
201 +static int ext4_mkdir(struct inode *dir, struct dentry *dentry, int mode)
204 + struct inode *inode;
205 + int err, retries = 0;
207 + if (EXT4_DIR_LINK_MAX(dir))
211 + handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) +
212 + EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3 +
213 + 2*EXT4_QUOTA_INIT_BLOCKS(dir->i_sb));
214 + if (IS_ERR(handle))
215 + return PTR_ERR(handle);
217 + if (IS_DIRSYNC(dir))
218 + ext4_handle_sync(handle);
220 + inode = ext4_new_inode(handle, dir, S_IFDIR | mode, &dentry->d_name,
221 + ext4_dentry_goal(dir->i_sb, dentry));
222 + err = PTR_ERR(inode);
227 + err = ext4_add_dot_dotdot(handle, dir, inode);
229 + goto out_clear_inode;
231 + err = ext4_add_entry(handle, dentry, inode);
233 + goto out_clear_inode;
234 ext4_inc_count(handle, dir);
235 ext4_update_dx_flag(dir);
236 err = ext4_mark_inode_dirty(handle, dir);
237 @@ -1958,11 +1999,16 @@ out_clear_inode:
238 d_instantiate(dentry, inode);
239 unlock_new_inode(inode);
242 ext4_journal_stop(handle);
243 if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries))
247 + clear_nlink(inode);
248 + unlock_new_inode(inode);
249 + ext4_mark_inode_dirty(handle, inode);