From: Jeff Layton <jlayton@redhat.com>
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 v4 14/17] vfs: fix renameat to retry on ESTALE errors
Date: Thu, 26 Jul 2012 07:55:17 -0400 [thread overview]
Message-ID: <1343303720-11199-15-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1343303720-11199-1-git-send-email-jlayton@redhat.com>
...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 <jlayton@redhat.com>
---
fs/namei.c | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 65e5177..7cf5e91 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3699,12 +3699,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;
@@ -3773,13 +3786,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.11.2
next prev parent reply other threads:[~2012-07-26 11:56 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-26 11:55 [PATCH v4 00/17] vfs: add the ability to retry on ESTALE to several syscalls Jeff Layton
2012-07-26 11:55 ` Jeff Layton
2012-07-26 11:55 ` [PATCH v4 01/17] vfs: add a retry_estale helper function to handle retries on ESTALE Jeff Layton
2012-07-26 11:55 ` [PATCH v4 02/17] vfs: add a kern_path_at function Jeff Layton
2012-07-26 11:55 ` Jeff Layton
2012-07-26 11:55 ` [PATCH v4 03/17] vfs: make fstatat retry on ESTALE errors from getattr call Jeff Layton
2012-07-26 11:55 ` [PATCH v4 04/17] vfs: fix readlinkat to retry on ESTALE Jeff Layton
2012-07-26 11:55 ` [PATCH v4 05/17] vfs: remove user_path_at_empty Jeff Layton
2012-07-26 11:55 ` [PATCH v4 06/17] vfs: turn "empty" arg in getname_flags into a bool Jeff Layton
2012-07-26 11:55 ` [PATCH v4 07/17] vfs: add new "reval" argument to kern_path_create Jeff Layton
2012-07-26 11:55 ` [PATCH v4 08/17] vfs: fix mknodat to retry on ESTALE errors Jeff Layton
2012-07-26 11:55 ` [PATCH v4 09/17] vfs: fix mkdir " Jeff Layton
2012-07-26 11:55 ` [PATCH v4 10/17] vfs: fix symlinkat " Jeff Layton
2012-07-26 11:55 ` [PATCH v4 11/17] vfs: fix linkat " Jeff Layton
2012-07-26 11:55 ` [PATCH v4 12/17] vfs: make rmdir " Jeff Layton
2012-07-26 11:55 ` [PATCH v4 13/17] vfs: make do_unlinkat " Jeff Layton
2012-07-26 11:55 ` Jeff Layton [this message]
2012-07-26 11:55 ` [PATCH v4 15/17] vfs: remove user_path_parent Jeff Layton
2012-07-26 11:55 ` Jeff Layton
2012-07-26 11:55 ` [PATCH v4 16/17] vfs: have do_sys_truncate retry once on an ESTALE error Jeff Layton
2012-07-26 11:55 ` [PATCH v4 17/17] vfs: have faccessat " Jeff Layton
2012-07-26 11:55 ` Jeff Layton
2012-07-27 2:15 ` [PATCH v4 00/17] vfs: add the ability to retry on ESTALE to several syscalls Namjae Jeon
2012-07-27 10:56 ` Jeff Layton
2012-07-27 10:56 ` Jeff Layton
2012-08-01 1:52 ` Namjae Jeon
2012-08-01 1:52 ` Namjae Jeon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343303720-11199-15-git-send-email-jlayton@redhat.com \
--to=jlayton@redhat.com \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=michael.brantley@deshaw.com \
--cc=miklos@szeredi.hu \
--cc=pstaubach@exagrid.com \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.