From 424bc8d39117a1fa5c37ab9504f9fbae6bbf3096 Mon Sep 17 00:00:00 2001
From: Suresh Jayaraman <sjayaraman@suse.de>
Date: Thu, 26 Aug 2010 14:46:09 +0530
Subject: [PATCH] --- yaml --- r: 210033 b: refs/heads/master c:
 f0138a79d74e1e942970ea163be268cd2e4bbcfc h: refs/heads/master i:   210031:
 ad8f4289cb576b76b37abb7225dca9eff644cf5c v: v3

---
 [refs]                | 2 +-
 trunk/fs/cifs/inode.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 */