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++;