From ae00b6a233741cebfac5020b6479b7bc753d2c8f Mon Sep 17 00:00:00 2001
From: Steve French <smfrench@gmail.com>
Date: Fri, 20 Jul 2007 13:07:26 -0500
Subject: [PATCH] --- yaml --- r: 67647 b: refs/heads/master c:
 afd0942d98f74296b74993739e41d2ca7cb9fd5a h: refs/heads/master i:   67645:
 dde3754ff798372a2aa369fba4247541596b5d71   67643:
 6eeebe4c96f23d2198eb71fc4f8134a19280f635   67639:
 32bfe70be4bf5c0e60e6355f2e85286d6663cdb8   67631:
 3380f92d350f06d2d51688563068d2659a5df58a   67615:
 172231a63ed8f83be287db4b25080c8fa358dc9c   67583:
 7d723b3957ba0fa14ccd60f00332d283f39b1ac2 v: v3

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

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);
 		}