linux-kernel.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 v6 08/20] vfs: fix linkat to retry on ESTALE errors
Date: Fri,  7 Sep 2012 10:18:15 -0400	[thread overview]
Message-ID: <1347027507-20956-9-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1347027507-20956-1-git-send-email-jlayton@redhat.com>

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

diff --git a/fs/namei.c b/fs/namei.c
index ac731fc..e05d6ee 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3612,6 +3612,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
 	struct path old_path, new_path;
 	int how = 0;
 	int error;
+	unsigned int try = 0;
 
 	if ((flags & ~(AT_SYMLINK_FOLLOW | AT_EMPTY_PATH)) != 0)
 		return -EINVAL;
@@ -3629,30 +3630,35 @@ 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;
+	do {
+		error = user_path_at(olddfd, oldname, how, &old_path);
+		if (error)
+			break;
 
-	new_dentry = user_path_create(newdfd, newname, &new_path, false, false);
-	error = PTR_ERR(new_dentry);
-	if (IS_ERR(new_dentry))
-		goto out;
+		new_dentry = user_path_create(newdfd, newname, &new_path,
+						false, false);
+		error = PTR_ERR(new_dentry);
+		if (IS_ERR(new_dentry))
+			goto out;
 
-	error = -EXDEV;
-	if (old_path.mnt != new_path.mnt)
-		goto out_dput;
-	error = may_linkat(&old_path);
-	if (unlikely(error))
-		goto out_dput;
-	error = security_path_link(old_path.dentry, &new_path, new_dentry);
-	if (error)
-		goto out_dput;
-	error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
+		error = -EXDEV;
+		if (old_path.mnt != new_path.mnt)
+			goto out_dput;
+		error = may_linkat(&old_path);
+		if (unlikely(error))
+			goto out_dput;
+		error = security_path_link(old_path.dentry, &new_path,
+						new_dentry);
+		if (error)
+			goto out_dput;
+		error = vfs_link(old_path.dentry, new_path.dentry->d_inode,
+						new_dentry);
 out_dput:
-	done_path_create(&new_path, new_dentry);
+		done_path_create(&new_path, new_dentry);
 out:
-	path_put(&old_path);
-
+		path_put(&old_path);
+		how |= LOOKUP_REVAL;
+	} while (retry_estale(error, try++));
 	return error;
 }
 
-- 
1.7.11.4


  parent reply	other threads:[~2012-09-07 14:19 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-07 14:18 [PATCH v6 00/20] vfs: add the ability to retry on ESTALE to several syscalls Jeff Layton
2012-09-07 14:18 ` [PATCH v6 01/20] vfs: add a retry_estale helper function to handle retries on ESTALE Jeff Layton
2012-09-07 14:18 ` [PATCH v6 02/20] vfs: make fstatat retry on ESTALE errors from getattr call Jeff Layton
2012-09-07 14:18 ` [PATCH v6 03/20] vfs: fix readlinkat to retry on ESTALE Jeff Layton
2012-09-07 14:18 ` [PATCH v6 04/20] vfs: add new "reval" argument to kern_path_create and user_path_create Jeff Layton
2012-09-07 14:18 ` [PATCH v6 05/20] vfs: fix mknodat to retry on ESTALE errors Jeff Layton
2012-09-07 14:18 ` [PATCH v6 06/20] vfs: fix mkdir " Jeff Layton
2012-09-07 14:18 ` [PATCH v6 07/20] vfs: fix symlinkat " Jeff Layton
2012-09-07 14:18 ` Jeff Layton [this message]
2012-09-07 14:18 ` [PATCH v6 09/20] vfs: add a reval argument to user_path_parent Jeff Layton
2012-09-07 14:18 ` [PATCH v6 10/20] vfs: make rmdir retry on ESTALE errors Jeff Layton
2012-09-07 14:18 ` [PATCH v6 11/20] vfs: make do_unlinkat " Jeff Layton
2012-09-07 14:18 ` [PATCH v6 12/20] vfs: fix renameat to " Jeff Layton
2012-09-07 14:18 ` [PATCH v6 13/20] vfs: have do_sys_truncate retry once on an ESTALE error Jeff Layton
2012-09-07 14:18 ` [PATCH v6 14/20] vfs: have faccessat " Jeff Layton
2012-09-07 14:18 ` [PATCH v6 15/20] vfs: have chdir retry lookup and call once on " Jeff Layton
2012-09-07 14:18 ` [PATCH v6 16/20] vfs: make chroot retry " Jeff Layton
2012-09-07 14:18 ` [PATCH v6 17/20] vfs: make fchmodat retry once on ESTALE errors Jeff Layton
2012-09-07 14:18 ` [PATCH v6 18/20] vfs: make fchownat " Jeff Layton
2012-09-07 14:18 ` [PATCH v6 19/20] vfs: convert do_filp_open to use retry_estale helper Jeff Layton
2012-09-07 14:18 ` [PATCH v6 20/20] vfs: convert do_file_open_root " 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=1347027507-20956-9-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).