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 11/17] vfs: fix linkat to retry on ESTALE errors
Date: Thu, 26 Jul 2012 07:55:14 -0400 [thread overview]
Message-ID: <1343303720-11199-12-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1343303720-11199-1-git-send-email-jlayton@redhat.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
fs/namei.c | 67 ++++++++++++++++++++++++++++++++++++++++----------------------
1 file changed, 43 insertions(+), 24 deletions(-)
diff --git a/fs/namei.c b/fs/namei.c
index 5a81c48..defb210 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3445,6 +3445,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
struct path old_path, new_path;
int how = 0;
int error;
+ char *old, *new;
+ unsigned int try = 0;
if ((flags & ~(AT_SYMLINK_FOLLOW | AT_EMPTY_PATH)) != 0)
return -EINVAL;
@@ -3462,34 +3464,51 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
if (flags & AT_SYMLINK_FOLLOW)
how |= LOOKUP_FOLLOW;
- error = user_path_at(olddfd, oldname, how, &old_path);
- if (error)
- return error;
+ old = getname_flags(oldname, how, NULL);
+ if (IS_ERR(old))
+ return PTR_ERR(old);
- new_dentry = user_path_create(newdfd, newname, &new_path, 0);
- error = PTR_ERR(new_dentry);
- if (IS_ERR(new_dentry))
- goto out;
+ new = getname(newname);
+ if (IS_ERR(new)) {
+ putname(old);
+ return PTR_ERR(new);
+ }
- error = -EXDEV;
- if (old_path.mnt != new_path.mnt)
- goto out_dput;
- error = mnt_want_write(new_path.mnt);
- if (error)
- goto out_dput;
- error = security_path_link(old_path.dentry, &new_path, new_dentry);
- if (error)
- goto out_drop_write;
- error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
+ do {
+ error = kern_path_at(olddfd, old, how, &old_path);
+ if (error)
+ break;
+
+ new_dentry = kern_path_create(newdfd, new, &new_path, 0, try);
+ error = PTR_ERR(new_dentry);
+ if (IS_ERR(new_dentry)) {
+ path_put(&old_path);
+ break;
+ }
+
+ error = -EXDEV;
+ if (old_path.mnt != new_path.mnt)
+ goto out_dput;
+ error = mnt_want_write(new_path.mnt);
+ if (error)
+ goto out_dput;
+ error = security_path_link(old_path.dentry, &new_path,
+ new_dentry);
+ if (error)
+ goto out_drop_write;
+ error = vfs_link(old_path.dentry, new_path.dentry->d_inode,
+ new_dentry);
out_drop_write:
- mnt_drop_write(new_path.mnt);
+ mnt_drop_write(new_path.mnt);
out_dput:
- dput(new_dentry);
- mutex_unlock(&new_path.dentry->d_inode->i_mutex);
- path_put(&new_path);
-out:
- path_put(&old_path);
-
+ dput(new_dentry);
+ mutex_unlock(&new_path.dentry->d_inode->i_mutex);
+ path_put(&new_path);
+ path_put(&old_path);
+ how |= LOOKUP_REVAL;
+ } while (retry_estale(error, try++));
+ putname(new);
+ putname(old);
return error;
}
--
1.7.11.2
next prev parent reply other threads:[~2012-07-26 11:55 UTC|newest]
Thread overview: 21+ 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 ` [PATCH v4 01/17] vfs: add a retry_estale helper function to handle retries on ESTALE Jeff Layton
[not found] ` <1343303720-11199-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2012-07-26 11:55 ` [PATCH v4 02/17] vfs: add a kern_path_at function Jeff Layton
2012-07-26 11:55 ` [PATCH v4 15/17] vfs: remove user_path_parent Jeff Layton
2012-07-26 11:55 ` [PATCH v4 17/17] vfs: have faccessat retry once on an ESTALE error 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 ` Jeff Layton [this message]
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 ` [PATCH v4 14/17] vfs: fix renameat to " 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-27 2:15 ` [PATCH v4 00/17] vfs: add the ability to retry on ESTALE to several syscalls Namjae Jeon
[not found] ` <CAKYAXd99VMYSX=k9eadB6MZvjQjQrOngOjUicjo+c9LtHvpz9w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-07-27 10:56 ` Jeff Layton
[not found] ` <20120727065630.0a3c5870-9yPaYZwiELC+kQycOl6kW4xkIHaj4LzF@public.gmane.org>
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-12-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).