From ceae7573ee7fe36f604cdc454b8703febaffe5eb Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Sat, 1 Jun 2013 11:52:43 +0200
Subject: [PATCH] --- yaml --- r: 377644 b: refs/heads/master c:
 2b6f8860e1df8ab318063765892e1a02cc5996c9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 10881c46587b..1d530030a8ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd51e61eac87c3e4819b54e85d536d2e643fb0ec
+refs/heads/master: 2b6f8860e1df8ab318063765892e1a02cc5996c9
diff --git a/trunk/fs/gfs2/inode.c b/trunk/fs/gfs2/inode.c
index 62b484e4a9e4..5fbb8dfb4653 100644
--- a/trunk/fs/gfs2/inode.c
+++ b/trunk/fs/gfs2/inode.c
@@ -588,7 +588,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
 		inode = gfs2_lookupi(dir, &dentry->d_name, 0);
 		gfs2_glock_dq_uninit(ghs);
 		d_instantiate(dentry, inode);
-		return IS_ERR(inode) ? PTR_ERR(inode) : 0;
+		return PTR_RET(inode);
 	}
 	if (error)
 		goto fail_gunlock;