From 6124196575b61b6e336bfd7525b7382a39145ccf Mon Sep 17 00:00:00 2001
From: Erez Zadok <ezk@fsl.cs.sunysb.edu>
Date: Sat, 21 May 2011 01:19:59 -0400
Subject: [PATCH] --- yaml --- r: 247809 b: refs/heads/master c:
 1a4022f88d40e1255920b017556092ab926d7f66 h: refs/heads/master i:   247807:
 3d0bcdca1244640f3c455c296e8068e97f4e01cd v: v3

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

diff --git a/[refs] b/[refs]
index 7cb6428f21f3..65dabfe1b949 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 052497553e5dedc04c43800820c1d5788201cc71
+refs/heads/master: 1a4022f88d40e1255920b017556092ab926d7f66
diff --git a/trunk/fs/namei.c b/trunk/fs/namei.c
index e3c4f112ebf7..6ff858c049c0 100644
--- a/trunk/fs/namei.c
+++ b/trunk/fs/namei.c
@@ -1378,12 +1378,12 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
 {
 	int res;
 
-	BUG_ON(nd->depth >= MAX_NESTED_LINKS);
 	if (unlikely(current->link_count >= MAX_NESTED_LINKS)) {
 		path_put_conditional(path, nd);
 		path_put(&nd->path);
 		return -ELOOP;
 	}
+	BUG_ON(nd->depth >= MAX_NESTED_LINKS);
 
 	nd->depth++;
 	current->link_count++;