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 v5 02/19] vfs: add a kern_path_at function
Date: Wed,  8 Aug 2012 09:21:25 -0400	[thread overview]
Message-ID: <1344432102-22312-3-git-send-email-jlayton@redhat.com> (raw)
In-Reply-To: <1344432102-22312-1-git-send-email-jlayton@redhat.com>

This will function like user_path_at, but does not do the getname and
putname, leaving that to the caller.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 fs/namei.c            | 27 +++++++++++++++++++--------
 include/linux/namei.h |  1 +
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index dc792e5..83a6f46 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2092,20 +2092,31 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len)
 	return __lookup_hash(&this, base, 0);
 }
 
+int kern_path_at(int dfd, const char *name, unsigned flags, struct path *path)
+{
+	struct nameidata nd;
+	int err;
+
+	BUG_ON(flags & LOOKUP_PARENT);
+
+	err = do_path_lookup(dfd, name, flags, &nd);
+	if (!err)
+		*path = nd.path;
+
+	return err;
+}
+
 int user_path_at_empty(int dfd, const char __user *name, unsigned flags,
 		 struct path *path, int *empty)
 {
-	struct nameidata nd;
 	char *tmp = getname_flags(name, flags, empty);
-	int err = PTR_ERR(tmp);
-	if (!IS_ERR(tmp)) {
-
-		BUG_ON(flags & LOOKUP_PARENT);
+	int err;
 
-		err = do_path_lookup(dfd, tmp, flags, &nd);
+	if (IS_ERR(tmp)) {
+		err = PTR_ERR(tmp);
+	} else {
+		err = kern_path_at(dfd, tmp, flags, path);
 		putname(tmp);
-		if (!err)
-			*path = nd.path;
 	}
 	return err;
 }
diff --git a/include/linux/namei.h b/include/linux/namei.h
index 4bf19d8..482f87f 100644
--- a/include/linux/namei.h
+++ b/include/linux/namei.h
@@ -55,6 +55,7 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LAST_DOTDOT, LAST_BIND};
 #define LOOKUP_ROOT		0x2000
 #define LOOKUP_EMPTY		0x4000
 
+extern int kern_path_at(int, const char *, unsigned, struct path *);
 extern int user_path_at(int, const char __user *, unsigned, struct path *);
 extern int user_path_at_empty(int, const char __user *, unsigned, struct path *, int *empty);
 
-- 
1.7.11.2

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

Thread overview: 22+ 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 ` Jeff Layton [this message]
2012-08-08 13:21 ` [PATCH v5 03/19] vfs: make fstatat retry on ESTALE errors from getattr call Jeff Layton
     [not found] ` <1344432102-22312-1-git-send-email-jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
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   ` [PATCH v5 07/19] vfs: add new "reval" argument to kern_path_create Jeff Layton
2012-08-09 11:57   ` [PATCH v5 00/19] vfs: add the ability to retry on ESTALE to several syscalls Namjae Jeon
     [not found]     ` <CAKYAXd9QyKtH7ZvCJs=X2DxhDn9_THXUooWVCWkxuEhizWgmsA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-08-09 12:18       ` 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 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

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-3-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).