From: David Howells Stop the UnionFS filesystem from using iget() and read_inode(). Replace unionfs_read_inode() with unionfs_iget(), and call that instead of iget(). unionfs_iget() then uses iget_locked() directly and returns a proper error code instead of an inode in the event of an error. unionfs_fill_super() returns any error incurred when getting the root inode instead of EINVAL. Signed-off-by: David Howells Cc: Erez Zadok Signed-off-by: Andrew Morton --- fs/unionfs/main.c | 11 +++++------ fs/unionfs/super.c | 22 ++++++++++++++++------ fs/unionfs/union.h | 1 + 3 files changed, 22 insertions(+), 12 deletions(-) diff -puN fs/unionfs/main.c~iget-stop-unionfs-from-using-iget-and-read_inode fs/unionfs/main.c --- a/fs/unionfs/main.c~iget-stop-unionfs-from-using-iget-and-read_inode +++ a/fs/unionfs/main.c @@ -104,9 +104,8 @@ struct dentry *unionfs_interpose(struct BUG_ON(is_negative_dentry); /* - * We allocate our new inode below, by calling iget. - * iget will call our read_inode which will initialize some - * of the new inode's fields + * We allocate our new inode below by calling unionfs_iget, + * which will initialize some of the new inode's fields */ /* @@ -128,9 +127,9 @@ struct dentry *unionfs_interpose(struct } } else { /* get unique inode number for unionfs */ - inode = iget(sb, iunique(sb, UNIONFS_ROOT_INO)); - if (!inode) { - err = -EACCES; + inode = unionfs_iget(sb, iunique(sb, UNIONFS_ROOT_INO)); + if (IS_ERR(inode)) { + err = PTR_ERR(inode); goto out; } if (atomic_read(&inode->i_count) > 1) diff -puN fs/unionfs/super.c~iget-stop-unionfs-from-using-iget-and-read_inode fs/unionfs/super.c --- a/fs/unionfs/super.c~iget-stop-unionfs-from-using-iget-and-read_inode +++ a/fs/unionfs/super.c @@ -24,12 +24,19 @@ */ static struct kmem_cache *unionfs_inode_cachep; -static void unionfs_read_inode(struct inode *inode) +struct inode *unionfs_iget(struct super_block *sb, unsigned long ino) { int size; - struct unionfs_inode_info *info = UNIONFS_I(inode); + struct unionfs_inode_info *info; + struct inode *inode; - unionfs_read_lock(inode->i_sb); + inode = iget_locked(sb, ino); + if (!inode) + return ERR_PTR(-ENOMEM); + if (!(inode->i_state & I_NEW)) + return inode; + + unionfs_read_lock(sb); memset(info, 0, offsetof(struct unionfs_inode_info, vfs_inode)); info->bstart = -1; @@ -46,7 +53,9 @@ static void unionfs_read_inode(struct in if (unlikely(!info->lower_inodes)) { printk(KERN_CRIT "unionfs: no kernel memory when allocating " "lower-pointer array!\n"); - BUG(); + iget_failed(inode); + unionfs_read_unlock(sb); + return ERR_PTR(-ENOMEM); } inode->i_version++; @@ -55,7 +64,9 @@ static void unionfs_read_inode(struct in inode->i_mapping->a_ops = &unionfs_aops; - unionfs_read_unlock(inode->i_sb); + unlock_new_inode(inode); + unionfs_read_unlock(sb); + return inode; } /* @@ -1002,7 +1013,6 @@ out: } struct super_operations unionfs_sops = { - .read_inode = unionfs_read_inode, .delete_inode = unionfs_delete_inode, .put_super = unionfs_put_super, .statfs = unionfs_statfs, diff -puN fs/unionfs/union.h~iget-stop-unionfs-from-using-iget-and-read_inode fs/unionfs/union.h --- a/fs/unionfs/union.h~iget-stop-unionfs-from-using-iget-and-read_inode +++ a/fs/unionfs/union.h @@ -354,6 +354,7 @@ extern int unionfs_fsync(struct file *fi extern int unionfs_fasync(int fd, struct file *file, int flag); /* Inode operations */ +extern struct inode *unionfs_iget(struct super_block *sb, unsigned long ino); extern int unionfs_rename(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir, struct dentry *new_dentry); extern int unionfs_unlink(struct inode *dir, struct dentry *dentry); _