diff --git a/[refs] b/[refs]
index 3457b3d9cc90..d2132c834804 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa0481e58a9a97a97035725a712920b5fe32f348
+refs/heads/master: afd0942d98f74296b74993739e41d2ca7cb9fd5a
diff --git a/trunk/fs/gfs2/ops_inode.c b/trunk/fs/gfs2/ops_inode.c
index 911c115b5c6c..5b8b994b9912 100644
--- a/trunk/fs/gfs2/ops_inode.c
+++ b/trunk/fs/gfs2/ops_inode.c
@@ -69,7 +69,7 @@ static int gfs2_create(struct inode *dir, struct dentry *dentry,
 			mark_inode_dirty(inode);
 			break;
 		} else if (PTR_ERR(inode) != -EEXIST ||
-			   (nd->intent.open.flags & O_EXCL)) {
+			   (nd && (nd->intent.open.flags & O_EXCL))) {
 			gfs2_holder_uninit(ghs);
 			return PTR_ERR(inode);
 		}