From patchwork Sat Oct 27 12:33:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1655101 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 45023DFAC4 for ; Sat, 27 Oct 2012 12:35:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756943Ab2J0Mf0 (ORCPT ); Sat, 27 Oct 2012 08:35:26 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:53867 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756788Ab2J0Mem (ORCPT ); Sat, 27 Oct 2012 08:34:42 -0400 Received: by mail-gg0-f174.google.com with SMTP id k5so690907ggd.19 for ; Sat, 27 Oct 2012 05:34:42 -0700 (PDT) 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=ENQvy+Wm7JbQnAWWlpYscepVNHlFFCqkwWc2Y/EYgV4=; b=IeWmIDT19PcH+TxnyIh62AZt+hHDu/lGWW14kNjWVETnarUL90iNO9LF968Q/9er4w BL0rqzWaOXseudhd3Lc9eKNUD66sR6SGd9JPytrl8pvbCCwOhyodnnHrsWK2rZcfFFUF isrZwM4/6KEgFP7QeO2QxY2S2rmyoPAk68LwFven00D+jL2WXDB7gR9QWbCjcNfKVQTv DfZnlCbdoSAt4An6uTD+3CQMnxt6epxCFY1WmhzpDpAW2iO8ccJSwvLZoTmaREEpvY9X 54Fpef58Hh8ApJ6PXmCtsB8+Rm6gnkuJlgauQOBHIrv39f42hG8uJbfROEwOYw3j9FOG fXGQ== Received: by 10.236.124.131 with SMTP id x3mr24771445yhh.14.1351341282565; Sat, 27 Oct 2012 05:34:42 -0700 (PDT) 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 f15sm4124613yhi.11.2012.10.27.05.34.41 (version=SSLv3 cipher=OTHER); Sat, 27 Oct 2012 05:34:41 -0700 (PDT) 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 v8 31/32] vfs: convert filename_lookup to use retry_estale helper Date: Sat, 27 Oct 2012 08:33:38 -0400 Message-Id: <1351341219-17837-32-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1351341219-17837-1-git-send-email-jlayton@redhat.com> References: <1351341219-17837-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQkIN6rdk/ht4l+FgczlbavLLFxb47B2SAPk2QRTyC0v61ojVn9X7GcWfcd6Kz3C1xNzFEih 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 c6173cc..6886630 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);