From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v7 40/49] vfs: convert do_file_open_root to use retry_estale helper Date: Mon, 1 Oct 2012 20:16:49 -0400 Message-ID: <1349137018-21948-41-git-send-email-jlayton@redhat.com> References: <1349137018-21948-1-git-send-email-jlayton@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: linux-fsdevel@vger.kernel.org, linux-audit@redhat.com, linux-kernel@vger.kernel.org To: viro@ZenIV.linux.org.uk Return-path: In-Reply-To: <1349137018-21948-1-git-send-email-jlayton@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com List-Id: linux-fsdevel.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 8e39510..9a7736f 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3031,6 +3031,7 @@ struct file *do_file_open_root(struct dentry *dentry, struct vfsmount *mnt, struct nameidata nd; struct file *file; struct getname_info ginfo = { .name = name }; + unsigned int try = 0; nd.root.mnt = mnt; nd.root.dentry = dentry; @@ -3043,7 +3044,7 @@ struct file *do_file_open_root(struct dentry *dentry, struct vfsmount *mnt, file = path_openat(-1, &ginfo, &nd, op, flags | LOOKUP_RCU); if (unlikely(file == ERR_PTR(-ECHILD))) file = path_openat(-1, &ginfo, &nd, op, flags); - if (unlikely(file == ERR_PTR(-ESTALE))) + while (retry_estale(PTR_ERR(file), try++)) file = path_openat(-1, &ginfo, &nd, op, flags | LOOKUP_REVAL); return file; } -- 1.7.11.4