From patchwork Mon May 11 18:07:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 6381831 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7BC089F374 for ; Mon, 11 May 2015 18:32:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BC3D120A8F for ; Mon, 11 May 2015 18:32:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DF3F420A81 for ; Mon, 11 May 2015 18:32:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754875AbbEKSaU (ORCPT ); Mon, 11 May 2015 14:30:20 -0400 Received: from zeniv.linux.org.uk ([195.92.253.2]:47213 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754970AbbEKSIV (ORCPT ); Mon, 11 May 2015 14:08:21 -0400 Received: from viro by ZenIV.linux.org.uk with local (Exim 4.76 #1 (Red Hat Linux)) id 1Yrs7n-0001Ri-KX; Mon, 11 May 2015 18:08:19 +0000 From: Al Viro To: Linus Torvalds Cc: Neil Brown , Christoph Hellwig , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v3 054/110] link_path_walk: nd->depth massage, part 3 Date: Mon, 11 May 2015 19:07:14 +0100 Message-Id: <1431367690-5223-54-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20150511180650.GA4147@ZenIV.linux.org.uk> References: <20150511180650.GA4147@ZenIV.linux.org.uk> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Al Viro remove decrement/increment surrounding nd_alloc_stack(), adjust the test in it. Signed-off-by: Al Viro --- fs/namei.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index a403425..3df4731 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -539,7 +539,7 @@ static int __nd_alloc_stack(struct nameidata *nd) static inline int nd_alloc_stack(struct nameidata *nd) { - if (likely(nd->depth != EMBEDDED_LEVELS - 1)) + if (likely(nd->depth != EMBEDDED_LEVELS)) return 0; if (likely(nd->stack != nd->internal)) return 0; @@ -1824,9 +1824,7 @@ Walked: if (err) { const char *s; - nd->depth--; err = nd_alloc_stack(nd); - nd->depth++; if (unlikely(err)) { path_to_nameidata(&nd->link, nd); break;