From patchwork Mon Nov 5 15:22:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1698721 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 357253FCA5 for ; Mon, 5 Nov 2012 15:26:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933081Ab2KEP0k (ORCPT ); Mon, 5 Nov 2012 10:26:40 -0500 Received: from mail-gg0-f174.google.com ([209.85.161.174]:42122 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933032Ab2KEPXP (ORCPT ); Mon, 5 Nov 2012 10:23:15 -0500 Received: by mail-gg0-f174.google.com with SMTP id k5so1001863ggd.19 for ; Mon, 05 Nov 2012 07:23:15 -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=in+uA8uzLYytC68rOCDjIT/xvESVDgRIhkyj2eZNaxg=; b=RZd8JKKHoniydqMC/qDRk3Mxc4xnwA9I9U8QAZ8iGAkvyWmEwKmeDwUKtu6H9WimEy xKMe0hOT19bHV7vBdxtjfQVGscTLKkwdIPp6hM3c7S/CbB7USceyIVKFR06YaG10RPc8 dp+S04yHuK5sPALtyIklmjPggSM43LRFgXa6+EQNnShRzhVA24heAbkXQrB3YoCLCm3p JmBBWTlKbubcClEKIXIsgag7T75xAsKdmAyIOYS+dMnZt6t2WzjHfVsGutZb6ioMJUlX VImUBKLfmpeYeuYbEfuxUFVDq/BKoscpsJjYcr8kX9AAE55WxmNspYne+pMHYsOvNkAn 6o9Q== Received: by 10.236.117.143 with SMTP id j15mr9125960yhh.79.1352128995369; Mon, 05 Nov 2012 07:23:15 -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.13 (version=SSLv3 cipher=OTHER); Mon, 05 Nov 2012 07:23:14 -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 29/34] vfs: convert do_filp_open to use retry_estale helper Date: Mon, 5 Nov 2012 10:22:08 -0500 Message-Id: <1352128933-28526-30-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: ALoCoQlBSYUTY2ev+2rbFdPAgSVSyNnDfRL8wcs2Pd+B5c0lK/6nPHo2IbxMPAfiUXaLZsD9Byhi 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 39adf1b..45a45d7 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3012,11 +3012,12 @@ struct file *do_filp_open(int dfd, struct filename *pathname, { struct nameidata nd; struct file *filp; + unsigned int try = 0; filp = path_openat(dfd, pathname, &nd, op, flags | LOOKUP_RCU); if (unlikely(filp == ERR_PTR(-ECHILD))) filp = path_openat(dfd, pathname, &nd, op, flags); - if (unlikely(filp == ERR_PTR(-ESTALE))) + while (retry_estale(PTR_ERR(filp), try++)) filp = path_openat(dfd, pathname, &nd, op, flags | LOOKUP_REVAL); return filp; }