---

yaml --- r: 247809 b: refs/heads/master c: 1a4022f h: refs/heads/master i: 247807: 3d0bcdc v: v3
git-mirror · May 21, 2011 · 6124196 · 6124196
1 parent 03a582f
commit 6124196
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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++;