From 2e972d1c0238f62299c1f625ea8bb0ff5d8c1be4 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Mon, 20 Oct 2008 19:23:53 +0200
Subject: [PATCH] --- yaml --- r: 118743 b: refs/heads/master c:
 87cfa004321c62aec681713ea48e0b846336d9f4 h: refs/heads/master i:   118741:
 eb3d965f2f79a75bfc1ab5f08d42f34f7babcbff   118739:
 bb91a3e01a8d7cf42fcfa83546b22b4e5edcbc1b   118735:
 1a0c2bcaaf2e62f9fccbab382a9bb2fdfa1944aa v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ocfs2/namei.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d5d314c9bcb9..6af1cf3c840b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa38e92cb34e27e60d0faf1035934eb9b44aa1d4
+refs/heads/master: 87cfa004321c62aec681713ea48e0b846336d9f4
diff --git a/trunk/fs/ocfs2/namei.c b/trunk/fs/ocfs2/namei.c
index 485a6aa0ad39..f594f300d4cd 100644
--- a/trunk/fs/ocfs2/namei.c
+++ b/trunk/fs/ocfs2/namei.c
@@ -378,8 +378,8 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb,
 	}
 
 	inode = new_inode(dir->i_sb);
-	if (IS_ERR(inode)) {
-		status = PTR_ERR(inode);
+	if (!inode) {
+		status = -ENOMEM;
 		mlog(ML_ERROR, "new_inode failed!\n");
 		goto leave;
 	}