diff --git a/[refs] b/[refs] index f059e2319f9d..ddd7ce940a5c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c89e5198b26a869ce2842bad8519264f3394dee9 +refs/heads/master: f0138a79d74e1e942970ea163be268cd2e4bbcfc diff --git a/trunk/fs/cifs/inode.c b/trunk/fs/cifs/inode.c index 4bc47e5b5f29..86a164f08a74 100644 --- a/trunk/fs/cifs/inode.c +++ b/trunk/fs/cifs/inode.c @@ -834,7 +834,7 @@ struct inode *cifs_root_iget(struct super_block *sb, unsigned long ino) xid, NULL); if (!inode) - return ERR_PTR(-ENOMEM); + return ERR_PTR(rc); #ifdef CONFIG_CIFS_FSCACHE /* populate tcon->resource_id */