diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index d4c79c12..8979e06b 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2222,6 +2222,12 @@ extern int ext4_orphan_add(handle_t *, struct inode *); 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, + uid_t *owner); +extern int ext4_delete_entry(handle_t *handle, struct inode * dir, + struct ext4_dir_entry_2 *de_del, + struct buffer_head *bh); extern int search_dir(struct buffer_head *bh, char *search_buf, int buf_size, diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 1821d9a4..140163d3 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2176,7 +2176,7 @@ int ext4_generic_delete_entry(handle_t *handle, return -ENOENT; } -static int ext4_delete_entry(handle_t *handle, +int ext4_delete_entry(handle_t *handle, struct inode *dir, struct ext4_dir_entry_2 *de_del, struct buffer_head *bh) @@ -2216,7 +2216,7 @@ out: ext4_std_error(dir->i_sb, err); return err; } - +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. @@ -2263,6 +2263,29 @@ static int ext4_add_nondir(handle_t *handle, return err; } + /* 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, + uid_t *owner) +{ + struct inode *inode; + + inode = ext4_new_inode(handle, dir, mode, NULL, 0, owner); + if (!IS_ERR(inode)) { + if (S_ISCHR(mode) || S_ISBLK(mode) || S_ISFIFO(mode)) { +#ifdef CONFIG_LDISKFS_FS_XATTR + inode->i_op = &ext4_special_inode_operations; +#endif + } else { + inode->i_op = &ext4_file_inode_operations; + inode->i_fop = &ext4_file_operations.kabi_fops; + 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