linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 v3 10/17] vfs: fix symlinkat to retry on ESTALE errors
Date: Fri, 29 Jun 2012 14:57:53 -0400	[thread overview]
Message-ID: <1340996280-27123-11-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1340996280-27123-1-git-send-email-jlayton@redhat.com>

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 fs/namei.c |   43 ++++++++++++++++++++++++++-----------------
 1 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index dec5713..a2d691a 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3033,33 +3033,42 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
 		int, newdfd, const char __user *, newname)
 {
 	int error;
-	char *from;
+	char *from, *to;
 	struct dentry *dentry;
 	struct path path;
+	unsigned int try = 0;
 
 	from = getname(oldname);
 	if (IS_ERR(from))
 		return PTR_ERR(from);
 
-	dentry = user_path_create(newdfd, newname, &path, 0);
-	error = PTR_ERR(dentry);
-	if (IS_ERR(dentry))
-		goto out_putname;
+	to = getname(newname);
+	if (IS_ERR(to)) {
+		putname(from);
+		return PTR_ERR(to);
+	}
 
-	error = mnt_want_write(path.mnt);
-	if (error)
-		goto out_dput;
-	error = security_path_symlink(&path, dentry, from);
-	if (error)
-		goto out_drop_write;
-	error = vfs_symlink(path.dentry->d_inode, dentry, from);
+	do {
+		dentry = kern_path_create(newdfd, to, &path, 0, try);
+		error = PTR_ERR(dentry);
+		if (IS_ERR(dentry))
+			break;
+
+		error = mnt_want_write(path.mnt);
+		if (error)
+			goto out_dput;
+		error = security_path_symlink(&path, dentry, from);
+		if (error)
+			goto out_drop_write;
+		error = vfs_symlink(path.dentry->d_inode, dentry, from);
 out_drop_write:
-	mnt_drop_write(path.mnt);
+		mnt_drop_write(path.mnt);
 out_dput:
-	dput(dentry);
-	mutex_unlock(&path.dentry->d_inode->i_mutex);
-	path_put(&path);
-out_putname:
+		dput(dentry);
+		mutex_unlock(&path.dentry->d_inode->i_mutex);
+		path_put(&path);
+	} while (retry_estale(error, try++));
+	putname(to);
 	putname(from);
 	return error;
 }
-- 
1.7.7.6

  parent reply	other threads:[~2012-06-29 18:57 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-29 18:57 [PATCH v3 00/17] vfs: add the ability to retry on ESTALE to several syscalls Jeff Layton
2012-06-29 18:57 ` [PATCH v3 01/17] vfs: add a retry_estale helper function to handle retries on ESTALE Jeff Layton
     [not found] ` <1340996280-27123-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2012-06-29 18:57   ` [PATCH v3 02/17] vfs: add a kern_path_at function Jeff Layton
2012-06-29 18:57   ` [PATCH v3 05/17] vfs: remove user_path_at_empty Jeff Layton
2012-06-29 18:57   ` [PATCH v3 13/17] vfs: make do_unlinkat retry on ESTALE errors Jeff Layton
2012-06-29 18:57 ` [PATCH v3 03/17] vfs: make fstatat retry on ESTALE errors from getattr call Jeff Layton
2012-06-29 18:57 ` [PATCH v3 04/17] vfs: fix readlinkat to retry on ESTALE Jeff Layton
2012-06-29 18:57 ` [PATCH v3 06/17] vfs: turn "empty" arg in getname_flags into a bool Jeff Layton
2012-06-29 18:57 ` [PATCH v3 07/17] vfs: add new "reval" argument to kern_path_create Jeff Layton
2012-06-29 18:57 ` [PATCH v3 08/17] vfs: fix mknodat to retry on ESTALE errors Jeff Layton
2012-06-29 18:57 ` [PATCH v3 09/17] vfs: fix mkdir " Jeff Layton
2012-06-29 18:57 ` Jeff Layton [this message]
2012-06-29 18:57 ` [PATCH v3 11/17] vfs: fix linkat " Jeff Layton
2012-06-29 18:57 ` [PATCH v3 12/17] vfs: make rmdir " Jeff Layton
2012-06-29 18:57 ` [PATCH v3 14/17] vfs: fix renameat to " Jeff Layton
2012-06-29 18:57 ` [PATCH v3 15/17] vfs: remove user_path_parent Jeff Layton
2012-06-29 18:57 ` [PATCH v3 16/17] vfs: have do_sys_truncate retry once on an ESTALE error Jeff Layton
2012-06-29 18:58 ` [PATCH v3 17/17] vfs: have faccessat " Jeff Layton
2012-07-11 18:42 ` [PATCH v3 00/17] vfs: add the ability to retry on ESTALE to several syscalls Steven J. Magnani
     [not found]   ` <1342032143.2190.22.camel-GF+V7FdoMD4Ycxa7k1C3m3PVXB/TiYYQ@public.gmane.org>
2012-07-11 19:00     ` Jeff Layton

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=1340996280-27123-11-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).