From: David Howells Stop the CIFS filesystem from using iget() and read_inode(). Replace cifs_read_inode() with cifs_iget(), and call that instead of iget(). cifs_iget() then uses iget_locked() directly and returns a proper error code instead of an inode in the event of an error. cifs_read_super() now returns any error incurred when getting the root inode instead of ENOMEM. cifs_iget() needs examining. The comment "can not call macro FreeXid here since in a void func" is no longer true. Signed-off-by: David Howells Cc: Steven French Acked-by: Christoph Hellwig Signed-off-by: Andrew Morton --- fs/cifs/cifsfs.c | 8 ++++---- fs/cifs/cifsfs.h | 1 + fs/cifs/inode.c | 22 +++++++++++++++++++--- 3 files changed, 24 insertions(+), 7 deletions(-) diff -puN fs/cifs/cifsfs.c~iget-stop-cifs-from-using-iget-and-read_inode-try fs/cifs/cifsfs.c --- a/fs/cifs/cifsfs.c~iget-stop-cifs-from-using-iget-and-read_inode-try +++ a/fs/cifs/cifsfs.c @@ -124,10 +124,11 @@ cifs_read_super(struct super_block *sb, #endif sb->s_blocksize = CIFS_MAX_MSGSIZE; sb->s_blocksize_bits = 14; /* default 2**14 = CIFS_MAX_MSGSIZE */ - inode = iget(sb, ROOT_I); + inode = cifs_iget(sb, ROOT_I); - if (!inode) { - rc = -ENOMEM; + if (IS_ERR(inode)) { + rc = PTR_ERR(inode); + inode = NULL; goto out_no_root; } @@ -480,7 +481,6 @@ static int cifs_remount(struct super_blo } static const struct super_operations cifs_super_ops = { - .read_inode = cifs_read_inode, .put_super = cifs_put_super, .statfs = cifs_statfs, .alloc_inode = cifs_alloc_inode, diff -puN fs/cifs/cifsfs.h~iget-stop-cifs-from-using-iget-and-read_inode-try fs/cifs/cifsfs.h --- a/fs/cifs/cifsfs.h~iget-stop-cifs-from-using-iget-and-read_inode-try +++ a/fs/cifs/cifsfs.h @@ -43,6 +43,7 @@ extern void cifs_read_inode(struct inode /* Functions related to inodes */ extern const struct inode_operations cifs_dir_inode_ops; +extern struct inode *cifs_iget(struct super_block *, unsigned long); extern int cifs_create(struct inode *, struct dentry *, int, struct nameidata *); extern struct dentry *cifs_lookup(struct inode *, struct dentry *, diff -puN fs/cifs/inode.c~iget-stop-cifs-from-using-iget-and-read_inode-try fs/cifs/inode.c --- a/fs/cifs/inode.c~iget-stop-cifs-from-using-iget-and-read_inode-try +++ a/fs/cifs/inode.c @@ -585,10 +585,18 @@ static const struct inode_operations cif }; /* gets root inode */ -void cifs_read_inode(struct inode *inode) +struct inode *cifs_iget(struct super_block *sb, unsigned long ino) { - int xid, rc; + int xid; struct cifs_sb_info *cifs_sb; + struct inode *inode; + long rc; + + inode = iget_locked(sb, ino); + if (!inode) + return ERR_PTR(-ENOMEM); + if (!(inode->i_state & I_NEW)) + return inode; cifs_sb = CIFS_SB(inode->i_sb); xid = GetXid(); @@ -605,10 +613,18 @@ void cifs_read_inode(struct inode *inode inode->i_fop = &simple_dir_operations; inode->i_uid = cifs_sb->mnt_uid; inode->i_gid = cifs_sb->mnt_gid; + _FreeXid(xid); + iget_failed(inode); + return ERR_PTR(rc); } - /* can not call macro FreeXid here since in a void func */ + unlock_new_inode(inode); + + /* can not call macro FreeXid here since in a void func + * TODO: This is no longer true + */ _FreeXid(xid); + return inode; } int cifs_unlink(struct inode *inode, struct dentry *direntry) _