Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-yx0-f174.google.com ([209.85.213.174]:50231 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932767Ab2F2S61 (ORCPT ); Fri, 29 Jun 2012 14:58:27 -0400 Received: by mail-yx0-f174.google.com with SMTP id l2so3038206yen.19 for ; Fri, 29 Jun 2012 11:58:27 -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 v3 14/17] vfs: fix renameat to retry on ESTALE errors Date: Fri, 29 Jun 2012 14:57:57 -0400 Message-Id: <1340996280-27123-15-git-send-email-jlayton@redhat.com> In-Reply-To: <1340996280-27123-1-git-send-email-jlayton@redhat.com> References: <1340996280-27123-1-git-send-email-jlayton@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: ...as always, rename is the messiest of the bunch. We have to track whether to retry or not via a separate flag since the error handling is already quite complex. Signed-off-by: Jeff Layton --- fs/namei.c | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 7fadc99..b38d734 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -3392,12 +3392,25 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname, char *from; char *to; int error; + unsigned int try = 0; + bool should_retry = false; + unsigned int lookup_flags = LOOKUP_PARENT; - error = user_path_parent(olddfd, oldname, &oldnd, &from); - if (error) + from = getname(oldname); + if (IS_ERR(from)) + return PTR_ERR(from); + + to = getname(newname); + if (IS_ERR(to)) { + error = PTR_ERR(to); goto exit; + } +retry: + error = do_path_lookup(olddfd, from, lookup_flags, &oldnd); + if (error) + goto exit0; - error = user_path_parent(newdfd, newname, &newnd, &to); + error = do_path_lookup(newdfd, to, lookup_flags, &newnd); if (error) goto exit1; @@ -3466,13 +3479,21 @@ exit4: dput(old_dentry); exit3: unlock_rename(new_dir, old_dir); + if (retry_estale(error, try++)) + should_retry = true; exit2: path_put(&newnd.path); - putname(to); exit1: path_put(&oldnd.path); - putname(from); + if (should_retry) { + should_retry = false; + lookup_flags |= LOOKUP_REVAL; + goto retry; + } +exit0: + putname(to); exit: + putname(from); return error; } -- 1.7.7.6