--- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1778,6 +1778,13 @@ extern int ext4_orphan_add(handle_t *, s extern int ext4_orphan_del(handle_t *, struct inode *); extern int ext4_htree_fill_tree(struct file *dir_file, __u32 start_hash, __u32 start_minor_hash, __u32 *next_hash); +extern struct inode *ext4_create_inode(handle_t *handle, + struct inode * dir, int mode); +extern int ext4_delete_entry(handle_t *handle, struct inode * dir, + struct ext4_dir_entry_2 * de_del, + struct buffer_head * bh); +extern int ext4_add_dot_dotdot(handle_t *handle, struct inode *dir, + struct inode *inode); /* resize.c */ extern int ext4_group_add(struct super_block *sb, --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -24,6 +24,7 @@ * Theodore Ts'o, 2002 */ +#include #include #include #include @@ -1704,10 +1707,10 @@ cleanup: * ext4_delete_entry deletes a directory entry by merging it with the * previous entry */ -static int ext4_delete_entry(handle_t *handle, - struct inode *dir, - struct ext4_dir_entry_2 *de_del, - struct buffer_head *bh) +int ext4_delete_entry(handle_t *handle, + struct inode *dir, + struct ext4_dir_entry_2 *de_del, + struct buffer_head *bh) { struct ext4_dir_entry_2 *de, *pde; unsigned int blocksize = dir->i_sb->s_blocksize; @@ -1742,7 +1745,7 @@ static int ext4_delete_entry(handle_t *h } return -ENOENT; } - +EXPORT_SYMBOL(ext4_delete_entry); /* * DIR_NLINK feature is set if 1) nlinks > EXT4_LINK_MAX or 2) nlinks == 2, * since this indicates that nlinks count was previously 1. @@ -1806,6 +1809,29 @@ static unsigned ext4_dentry_goal(struct return inum; } + /* Return locked inode, then the caller can modify the inode's states/flags + * before others finding it. The caller should unlock the inode by itself. */ +struct inode *ext4_create_inode(handle_t *handle, struct inode *dir, int mode) +{ + struct inode *inode; + + inode = ext4_new_inode(handle, dir, mode, 0, + EXT4_SB(dir->i_sb)->s_inode_goal); + if (!IS_ERR(inode)) { + if (S_ISCHR(mode) || S_ISBLK(mode) || S_ISFIFO(mode)) { +#ifdef CONFIG_EXT4_FS_XATTR + inode->i_op = &ext4_special_inode_operations; +#endif + } else { + inode->i_op = &ext4_file_inode_operations; + inode->i_fop = &ext4_file_operations; + ext4_set_aops(inode); + } + } + return inode; +} +EXPORT_SYMBOL(ext4_create_inode); + /* * By the time this is called, we already have created * the directory cache entry for the new file, but it @@ -1882,44 +1908,32 @@ retry: return err; } -static int ext4_mkdir(struct inode *dir, struct dentry *dentry, int mode) +/* Initialize @inode as a subdirectory of @dir, and add the + * "." and ".." entries into the first directory block. */ +int ext4_add_dot_dotdot(handle_t *handle, struct inode * dir, + struct inode *inode) { - handle_t *handle; - struct inode *inode; - struct buffer_head *dir_block = NULL; - struct ext4_dir_entry_2 *de; + struct buffer_head * dir_block; + struct ext4_dir_entry_2 * de; unsigned int blocksize = dir->i_sb->s_blocksize; - int err, retries = 0; + int err = 0; - if (EXT4_DIR_LINK_MAX(dir)) - return -EMLINK; - -retry: - handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) + - EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3 + - EXT4_MAXQUOTAS_INIT_BLOCKS(dir->i_sb)); if (IS_ERR(handle)) return PTR_ERR(handle); if (IS_DIRSYNC(dir)) ext4_handle_sync(handle); - inode = ext4_new_inode(handle, dir, S_IFDIR | mode, - &dentry->d_name, 0); - err = PTR_ERR(inode); - if (IS_ERR(inode)) - goto out_stop; - inode->i_op = &ext4_dir_inode_operations; inode->i_fop = &ext4_dir_operations; inode->i_size = EXT4_I(inode)->i_disksize = inode->i_sb->s_blocksize; dir_block = ext4_bread(handle, inode, 0, 1, &err); if (!dir_block) - goto out_clear_inode; + goto get_out; BUFFER_TRACE(dir_block, "get_write_access"); err = ext4_journal_get_write_access(handle, dir_block); if (err) - goto out_clear_inode; + goto get_out; de = (struct ext4_dir_entry_2 *) dir_block->b_data; de->inode = cpu_to_le32(inode->i_ino); de->name_len = 1; @@ -1938,18 +1952,46 @@ retry: BUFFER_TRACE(dir_block, "call ext4_handle_dirty_metadata"); err = ext4_handle_dirty_metadata(handle, inode, dir_block); if (err) - goto out_clear_inode; + goto get_out; err = ext4_mark_inode_dirty(handle, inode); - if (!err) - err = ext4_add_entry(handle, dentry, inode); - if (err) { -out_clear_inode: - clear_nlink(inode); - unlock_new_inode(inode); - ext4_mark_inode_dirty(handle, inode); - iput(inode); +get_out: + brelse(dir_block); + return err; +} +EXPORT_SYMBOL(ext4_add_dot_dotdot); + + +static int ext4_mkdir(struct inode *dir, struct dentry *dentry, int mode) +{ + handle_t *handle; + struct inode *inode; + int err, retries = 0; + + if (EXT4_DIR_LINK_MAX(dir)) + return -EMLINK; + +retry: + handle = ext4_journal_start(dir, EXT4_DATA_TRANS_BLOCKS(dir->i_sb) + + EXT4_INDEX_EXTRA_TRANS_BLOCKS + 3 + + 2*EXT4_QUOTA_INIT_BLOCKS(dir->i_sb)); + if (IS_ERR(handle)) + return PTR_ERR(handle); + + if (IS_DIRSYNC(dir)) + ext4_handle_sync(handle); + + inode = ext4_new_inode(handle, dir, S_IFDIR | mode, &dentry->d_name, 0); + err = PTR_ERR(inode); + if (IS_ERR(inode)) goto out_stop; - } + + err = ext4_add_dot_dotdot(handle, dir, inode); + if (err) + goto out_clear_inode; + + err = ext4_add_entry(handle, dentry, inode); + if (err) + goto out_clear_inode; ext4_inc_count(handle, dir); ext4_update_dx_flag(dir); err = ext4_mark_inode_dirty(handle, dir); @@ -1958,11 +2001,16 @@ out_clear_inode: d_instantiate(dentry, inode); unlock_new_inode(inode); out_stop: - brelse(dir_block); ext4_journal_stop(handle); if (err == -ENOSPC && ext4_should_retry_alloc(dir->i_sb, &retries)) goto retry; return err; +out_clear_inode: + clear_nlink(inode); + unlock_new_inode(inode); + ext4_mark_inode_dirty(handle, inode); + iput(inode); + goto out_stop; } /*