X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=fs%2Fnamei.c;h=d4a6dd77230383edefa16ce0b2566d64c08735ea;hb=a195f3d4528a2f88d6f986f6b1101775ad4891cf;hp=f1eb8ccd2be9582ded540baa243194cd8d243eec;hpb=96485e4462604744d66bf4301557d996d80b85eb;p=linux-2.6-microblaze.git

diff --git a/fs/namei.c b/fs/namei.c
index f1eb8ccd2be9..d4a6dd772303 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1626,7 +1626,8 @@ static const char *pick_link(struct nameidata *nd, struct path *link,
 			return ERR_PTR(error);
 	}
 
-	if (unlikely(nd->flags & LOOKUP_NO_SYMLINKS))
+	if (unlikely(nd->flags & LOOKUP_NO_SYMLINKS) ||
+			unlikely(link->mnt->mnt_flags & MNT_NOSYMFOLLOW))
 		return ERR_PTR(-ELOOP);
 
 	if (!(nd->flags & LOOKUP_RCU)) {