From patchwork Sat Oct 27 12:33:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1655161 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 5E659DFAC4 for ; Sat, 27 Oct 2012 12:36:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756798Ab2J0MgV (ORCPT ); Sat, 27 Oct 2012 08:36:21 -0400 Received: from mail-ye0-f174.google.com ([209.85.213.174]:54786 "EHLO mail-ye0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756161Ab2J0Mej (ORCPT ); Sat, 27 Oct 2012 08:34:39 -0400 Received: by mail-ye0-f174.google.com with SMTP id m12so638386yen.19 for ; Sat, 27 Oct 2012 05:34:39 -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=Ap6GoYPkrKCVuzXFTz9XSoCQfHWWB0o9bomLtQWf0Mk=; b=bioB9tggDu2ligWPfW287qc8yRG0m5AEv9lOAShjf8/2KJASlF8BFtg+uVwLkYtbAm HlPcgy/w84IYHUle8Z9jpjJrYF7FK2RUmeyt8kyLdAOnk1V3AyU+uaiY89vlyA5Y6OEj 4CR3rtUqmQLGQIFFpRGaqotmtD0BnTaF4Mz1F6bkaHs6BtjfBmlVfMA2Vk//AkwouGHH qfBoUIvLofDFQsc4o/NrSM8D5Rrpn6tziaynNAEuSKgRsMEKfZmF1ahdMxt2VcB+L4Mh VSMeysKtgrFIhQhr1kCDFjXjqUbx8hpFSgHVRuGN7kfbKMldJiBs3w9Db9XVy8eTerZX WX8w== Received: by 10.236.143.131 with SMTP id l3mr24677208yhj.108.1351341279556; Sat, 27 Oct 2012 05:34:39 -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.38 (version=SSLv3 cipher=OTHER); Sat, 27 Oct 2012 05:34:38 -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 29/32] vfs: convert do_filp_open to use retry_estale helper Date: Sat, 27 Oct 2012 08:33:36 -0400 Message-Id: <1351341219-17837-30-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: ALoCoQlbdP67SZTIm4q5TqXeuxt6gEk5wUC0h/Gy9T81PCUCyiZTAfxRqmb81824npRYSGM4Lilz 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 27bff9b..6930e91 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; }