diff --git a/[refs] b/[refs]
index 8dabb5e58187..a5bda250aa2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 582aa64a04a579d47d05e4a0ee85bf047978ef4d
+refs/heads/master: 741b7c3f77937b2fb7c10aeb4c5c621463582583
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index e245d88b4d69..35195ff9d194 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -1859,7 +1859,7 @@ static int path_init(int dfd, const char *name, unsigned int flags,
 	if (flags & LOOKUP_ROOT) {
 		struct inode *inode = nd->root.dentry->d_inode;
 		if (*name) {
-			if (!inode->i_op->lookup)
+			if (!can_lookup(inode))
 				return -ENOTDIR;
 			retval = inode_permission(inode, MAY_EXEC);
 			if (retval)
@@ -1913,7 +1913,7 @@ static int path_init(int dfd, const char *name, unsigned int flags,
 		dentry = f.file->f_path.dentry;
 
 		if (*name) {
-			if (!S_ISDIR(dentry->d_inode->i_mode)) {
+			if (!can_lookup(dentry->d_inode)) {
 				fdput(f);
 				return -ENOTDIR;
 			}