From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Layton Subject: [PATCH v9 30/34] vfs: convert do_file_open_root to use retry_estale helper Date: Mon, 5 Nov 2012 10:22:09 -0500 Message-ID: <1352128933-28526-31-git-send-email-jlayton@redhat.com> References: <1352128933-28526-1-git-send-email-jlayton@redhat.com> 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 To: viro@zeniv.linux.org.uk Return-path: In-Reply-To: <1352128933-28526-1-git-send-email-jlayton@redhat.com> Sender: linux-kernel-owner@vger.kernel.org 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 45a45d7..fbfeb88 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; } -- 1.7.11.7