All of lore.kernel.org
 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 v5 04/19] vfs: fix readlinkat to retry on ESTALE
Date: Wed,  8 Aug 2012 09:21:27 -0400	[thread overview]
Message-ID: <1344432102-22312-5-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1344432102-22312-1-git-send-email-jlayton@redhat.com>

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 fs/stat.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/fs/stat.c b/fs/stat.c
index 5afeb37..c9d88f7 100644
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -307,14 +307,25 @@ SYSCALL_DEFINE4(readlinkat, int, dfd, const char __user *, pathname,
 	struct path path;
 	int error;
 	int empty = 0;
+	char *name;
+	unsigned int try = 0;
+	unsigned int lookup_flags = LOOKUP_EMPTY;
 
 	if (bufsiz <= 0)
 		return -EINVAL;
 
-	error = user_path_at_empty(dfd, pathname, LOOKUP_EMPTY, &path, &empty);
-	if (!error) {
-		struct inode *inode = path.dentry->d_inode;
+	name = getname_flags(pathname, lookup_flags, &empty);
+	if (IS_ERR(name))
+		return PTR_ERR(name);
+
+	do {
+		struct inode *inode;
+
+		error = kern_path_at(dfd, name, lookup_flags, &path);
+		if (error)
+			break;
 
+		inode = path.dentry->d_inode;
 		error = empty ? -ENOENT : -EINVAL;
 		if (inode->i_op->readlink) {
 			error = security_inode_readlink(path.dentry);
@@ -325,7 +336,9 @@ SYSCALL_DEFINE4(readlinkat, int, dfd, const char __user *, pathname,
 			}
 		}
 		path_put(&path);
-	}
+		lookup_flags |= LOOKUP_REVAL;
+	} while (retry_estale(error, try++));
+	putname(name);
 	return error;
 }
 
-- 
1.7.11.2


WARNING: multiple messages have this Message-ID (diff)
From: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: viro-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org
Cc: linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	michael.brantley-Iq/kdjr4a97QT0dZR+AlfA@public.gmane.org,
	hch-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org,
	miklos-sUDqSbJrdHQHWmgEVkV9KA@public.gmane.org,
	pstaubach-83r9SdEf25FBDgjK7y7TUQ@public.gmane.org
Subject: [PATCH v5 04/19] vfs: fix readlinkat to retry on ESTALE
Date: Wed,  8 Aug 2012 09:21:27 -0400	[thread overview]
Message-ID: <1344432102-22312-5-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1344432102-22312-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

Signed-off-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 fs/stat.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/fs/stat.c b/fs/stat.c
index 5afeb37..c9d88f7 100644
--- a/fs/stat.c
+++ b/fs/stat.c
@@ -307,14 +307,25 @@ SYSCALL_DEFINE4(readlinkat, int, dfd, const char __user *, pathname,
 	struct path path;
 	int error;
 	int empty = 0;
+	char *name;
+	unsigned int try = 0;
+	unsigned int lookup_flags = LOOKUP_EMPTY;
 
 	if (bufsiz <= 0)
 		return -EINVAL;
 
-	error = user_path_at_empty(dfd, pathname, LOOKUP_EMPTY, &path, &empty);
-	if (!error) {
-		struct inode *inode = path.dentry->d_inode;
+	name = getname_flags(pathname, lookup_flags, &empty);
+	if (IS_ERR(name))
+		return PTR_ERR(name);
+
+	do {
+		struct inode *inode;
+
+		error = kern_path_at(dfd, name, lookup_flags, &path);
+		if (error)
+			break;
 
+		inode = path.dentry->d_inode;
 		error = empty ? -ENOENT : -EINVAL;
 		if (inode->i_op->readlink) {
 			error = security_inode_readlink(path.dentry);
@@ -325,7 +336,9 @@ SYSCALL_DEFINE4(readlinkat, int, dfd, const char __user *, pathname,
 			}
 		}
 		path_put(&path);
-	}
+		lookup_flags |= LOOKUP_REVAL;
+	} while (retry_estale(error, try++));
+	putname(name);
 	return error;
 }
 
-- 
1.7.11.2

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2012-08-08 13:22 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-08 13:21 [PATCH v5 00/19] vfs: add the ability to retry on ESTALE to several syscalls Jeff Layton
2012-08-08 13:21 ` [PATCH v5 01/19] vfs: add a retry_estale helper function to handle retries on ESTALE Jeff Layton
2012-08-08 13:21 ` [PATCH v5 02/19] vfs: add a kern_path_at function Jeff Layton
2012-08-08 13:21 ` [PATCH v5 03/19] vfs: make fstatat retry on ESTALE errors from getattr call Jeff Layton
2012-08-08 13:21 ` Jeff Layton [this message]
2012-08-08 13:21   ` [PATCH v5 04/19] vfs: fix readlinkat to retry on ESTALE Jeff Layton
2012-08-08 13:21 ` [PATCH v5 05/19] vfs: remove user_path_at_empty Jeff Layton
2012-08-08 13:21   ` Jeff Layton
2012-08-08 13:21 ` [PATCH v5 06/19] vfs: turn "empty" arg in getname_flags into a bool Jeff Layton
2012-08-08 13:21 ` [PATCH v5 07/19] vfs: add new "reval" argument to kern_path_create Jeff Layton
2012-08-08 13:21   ` Jeff Layton
2012-08-08 13:21 ` [PATCH v5 08/19] vfs: fix mknodat to retry on ESTALE errors Jeff Layton
2012-08-08 13:21 ` [PATCH v5 09/19] vfs: fix mkdir " Jeff Layton
2012-08-08 13:21 ` [PATCH v5 10/19] vfs: fix symlinkat " Jeff Layton
2012-08-08 13:21 ` [PATCH v5 11/19] vfs: fix linkat " Jeff Layton
2012-08-08 13:21 ` [PATCH v5 12/19] vfs: make rmdir " Jeff Layton
2012-08-08 13:21 ` [PATCH v5 13/19] vfs: make do_unlinkat " Jeff Layton
2012-08-08 13:21 ` [PATCH v5 14/19] vfs: fix renameat to " Jeff Layton
2012-08-08 13:21 ` [PATCH v5 15/19] vfs: remove user_path_parent Jeff Layton
2012-08-08 13:21 ` [PATCH v5 16/19] vfs: have do_sys_truncate retry once on an ESTALE error Jeff Layton
2012-08-08 13:21 ` [PATCH v5 17/19] vfs: have faccessat " Jeff Layton
2012-08-08 13:21 ` [PATCH v5 18/19] vfs: have chdir retry lookup and call once on " Jeff Layton
2012-08-08 13:21 ` [PATCH v5 19/19] vfs: make chroot retry " Jeff Layton
2012-08-09 11:57 ` [PATCH v5 00/19] vfs: add the ability to retry on ESTALE to several syscalls Namjae Jeon
2012-08-09 11:57   ` Namjae Jeon
2012-08-09 12:18   ` Jeff Layton
2012-08-09 12:18     ` 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=1344432102-22312-5-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.