diff options
| author | Linus Torvalds | 2010-08-28 14:05:15 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2010-08-28 14:05:15 -0700 |
| commit | 7be0d4f90ad8e0f9591fd311765a212a42e26b13 (patch) | |
| tree | de0050139b877edea5e9372e13bbcb152daaf3b3 /fs/cifs/inode.c | |
| parent | 62b88dc1912c7d105f768e0e64756f8bd83936db (diff) | |
| parent | f0138a79d74e1e942970ea163be268cd2e4bbcfc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
Cannot allocate memory error on mount
[CIFS] Eliminate unused variable warning
Diffstat (limited to 'fs/cifs/inode.c')
| -rw-r--r-- | fs/cifs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 4bc47e5b5f29..86a164f08a74 100644 --- a/fs/cifs/inode.c +++ b/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 */ |