diff --git a/[refs] b/[refs]
index b5f32b0b3f59..8572f11012bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47b3bc907328db968bc9b43c41f48f8d1e140750
+refs/heads/master: 7b54c165a0c012edbaeaa73c5c87cb73721eb580
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index 961bc1268366..57ae9c8c66bf 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -689,8 +689,6 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
 	nd->path = *path;
 	nd->inode = nd->path.dentry->d_inode;
 	nd->flags |= LOOKUP_JUMPED;
-
-	BUG_ON(nd->inode->i_op->follow_link);
 }
 
 static inline void put_link(struct nameidata *nd, struct path *link, void *cookie)