From patchwork Sat Oct 27 12:33:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1655131 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 926FE3FD4E for ; Sat, 27 Oct 2012 12:36:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756788Ab2J0MgI (ORCPT ); Sat, 27 Oct 2012 08:36:08 -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 S1756689Ab2J0Mel (ORCPT ); Sat, 27 Oct 2012 08:34:41 -0400 Received: by mail-gg0-f174.google.com with SMTP id k5so690907ggd.19 for ; Sat, 27 Oct 2012 05:34:41 -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=1w6rjFV9n6d9s1XPv/fMqo6o/TgshYIdslkxA9icnao=; b=kDHPhdJ/wBJZSi/l0HovBqhTZn5lHtCRLZhk6iYdyuXB642nh/CjKzDVEpQbLpTBRK 2AYyydmCUokAgSEOKfM/VI3aGc3EdvH1xxy3QkJqo6FYnll6DcUanFfUK7bRLwOIRytb 5L/Wgt9ptMVuK4msxQiD4T/vfKt2FSgxMqootQNuxDyX3xI/CDf7R/Eup5IgMlkaAJJW XSlmCJalgESYSg+b21GqYoCe+0JqT7f7mA8WUQxsvUpv/m1Pvesk+8F7DNq+H4iza36J j8hKzlG6f+tQosoZPvcPtP7D8omg3SGzojZRr9uey9kS9z3ZMdaEvccRKO8Wk5C0WmjV k55A== Received: by 10.101.112.20 with SMTP id p20mr7604439anm.10.1351341281038; Sat, 27 Oct 2012 05:34:41 -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.39 (version=SSLv3 cipher=OTHER); Sat, 27 Oct 2012 05:34:40 -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 30/32] vfs: convert do_file_open_root to use retry_estale helper Date: Sat, 27 Oct 2012 08:33:37 -0400 Message-Id: <1351341219-17837-31-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: ALoCoQlM/PekRq8dZxvRLxrETs7Eh5A97mOwv94uOeuNN+YGiy/GpkuSn3J0ubHjevLo7nQSgF9b 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 6930e91..c6173cc 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3028,6 +3028,7 @@ struct file *do_file_open_root(struct dentry *dentry, struct vfsmount *mnt, struct nameidata nd; struct file *file; struct filename filename = { .name = name }; + unsigned int try = 0; nd.root.mnt = mnt; nd.root.dentry = dentry; @@ -3040,7 +3041,7 @@ struct file *do_file_open_root(struct dentry *dentry, struct vfsmount *mnt, file = path_openat(-1, &filename, &nd, op, flags | LOOKUP_RCU); if (unlikely(file == ERR_PTR(-ECHILD))) file = path_openat(-1, &filename, &nd, op, flags); - if (unlikely(file == ERR_PTR(-ESTALE))) + while (retry_estale(PTR_ERR(file), try++)) file = path_openat(-1, &filename, &nd, op, flags | LOOKUP_REVAL); return file; }