From patchwork Mon Nov 5 15:22:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1698671 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id A9095E0010 for ; Mon, 5 Nov 2012 15:24:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933149Ab2KEPYn (ORCPT ); Mon, 5 Nov 2012 10:24:43 -0500 Received: from mail-ye0-f174.google.com ([209.85.213.174]:52182 "EHLO mail-ye0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932847Ab2KEPXT (ORCPT ); Mon, 5 Nov 2012 10:23:19 -0500 Received: by mail-ye0-f174.google.com with SMTP id m12so1017184yen.19 for ; Mon, 05 Nov 2012 07:23:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=Oa6yzPW/3daF3b8iRlVd4yPI2NaITP52MkpciBLFGWc=; b=Oho1N8pdeezWNGL6AN/BEapkDEGFm/Bqn0LpKwUO0ZaftI7Bx0hRDIiG8El2hLiggp bE5/Q1wf5cvxdmiYMAp8DSds9haGn8+y3z3iQoQ4RFDktuZg4AC8+ia6/QIRajdDeZoC sIk7/WsiNsGlTKdaMk0HEoLgLArXb9u9rf4VncpbwhtGuqoGfrEu7LUZ7AIB+SgFHFiL T9ODeUIgnrTJM391E2/sjV8wZodGJhckUaUgI9K7tcQ0oluQhV/0lB5pABXp/W0spwk+ TxXW9UNmOncF3V+7JlXsSwBdrkUxw5XsCnmvPuPluLYsGba7y/unoiiB7Ja9rdIYq8xb 1gaQ== Received: by 10.236.137.104 with SMTP id x68mr9106086yhi.65.1352128999378; Mon, 05 Nov 2012 07:23:19 -0800 (PST) Received: from salusa.poochiereds.net (cpe-107-015-110-129.nc.res.rr.com. [107.15.110.129]) by mx.google.com with ESMTPS id y18sm12026769anh.15.2012.11.05.07.23.17 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 07:23:18 -0800 (PST) From: Jeff Layton To: viro@zeniv.linux.org.uk Cc: linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org, michael.brantley@deshaw.com, hch@infradead.org, miklos@szeredi.hu, pstaubach@exagrid.com Subject: [PATCH v9 31/34] vfs: convert filename_lookup to use retry_estale helper Date: Mon, 5 Nov 2012 10:22:10 -0500 Message-Id: <1352128933-28526-32-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1352128933-28526-1-git-send-email-jlayton@redhat.com> References: <1352128933-28526-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQmzbdGC2/rqVEU5SUJngnJUT5wUcl+Kw/dgcdTWwHAYLNVzOt9Hu4cU+z3BfZCadV+6z25e Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Jeff Layton --- fs/namei.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/namei.c b/fs/namei.c index fbfeb88..c3582d4 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2020,10 +2020,11 @@ static int path_lookupat(int dfd, const char *name, static int filename_lookup(int dfd, struct filename *name, unsigned int flags, struct nameidata *nd) { + unsigned int try = 0; int retval = path_lookupat(dfd, name->name, flags | LOOKUP_RCU, nd); if (unlikely(retval == -ECHILD)) retval = path_lookupat(dfd, name->name, flags, nd); - if (unlikely(retval == -ESTALE)) + while (retry_estale(retval, try++)) retval = path_lookupat(dfd, name->name, flags | LOOKUP_REVAL, nd);