From 21cfbfbc8ad492b504022c9ebadb9d9cb7fd76ea Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Mon, 16 Nov 2009 12:05:20 -0800
Subject: [PATCH] --- yaml --- r: 177747 b: refs/heads/master c:
 cb59861f03a626196a23fdef5e20ddbb8cca6466 h: refs/heads/master i:   177745:
 d495de87b6c20f699e792c4cf288db5cf7b37e79   177743:
 38d20c41240020d17eca46e3640a5d835ec0aec9 v: v3

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

diff --git a/[refs] b/[refs]
index 2e55c80608dc..629f19106e69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3a065e3f13da8a3470ed09c7f38aad256083726
+refs/heads/master: cb59861f03a626196a23fdef5e20ddbb8cca6466
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index d2783c8a770b..dad4b80257db 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -1764,7 +1764,7 @@ struct file *do_filp_open(int dfd, const char *pathname,
 
 	path_to_nameidata(&path, &nd);
 	error = -EISDIR;
-	if (path.dentry->d_inode && S_ISDIR(path.dentry->d_inode->i_mode))
+	if (S_ISDIR(path.dentry->d_inode->i_mode))
 		goto exit;
 ok:
 	/*