All of lore.kernel.org
 help / color / mirror / Atom feed
From: Amir Goldstein <amir73il@gmail.com>
To: Miklos Szeredi <miklos@szeredi.hu>
Cc: Chandan Rajendra <chandan@linux.vnet.ibm.com>,
	linux-unionfs@vger.kernel.org
Subject: [PATCH v3 3/5] vfs: factor out lookup_one_len_init()
Date: Thu,  1 Jun 2017 12:02:57 +0300	[thread overview]
Message-ID: <1496307779-2766-4-git-send-email-amir73il@gmail.com> (raw)
In-Reply-To: <1496307779-2766-1-git-send-email-amir73il@gmail.com>

In preparation of adding a new helper lookup_one_len_noperm(),
factor out the common bits of lookup_one_len{,_unlocked}().

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
 fs/namei.c | 88 +++++++++++++++++++++++++++-----------------------------------
 1 file changed, 38 insertions(+), 50 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 6571a5f5112e..263caf0efafe 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2446,50 +2446,61 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt,
 }
 EXPORT_SYMBOL(vfs_path_lookup);
 
-/**
- * lookup_one_len - filesystem helper to lookup single pathname component
- * @name:	pathname component to lookup
- * @base:	base directory to lookup from
- * @len:	maximum length @len should be interpreted to
- *
- * Note that this routine is purely a helper for filesystem usage and should
- * not be called by generic code.
- *
- * The caller must hold base->i_mutex.
- */
-struct dentry *lookup_one_len(const char *name, struct dentry *base, int len)
+static int lookup_one_len_init(struct qstr *this, struct dentry *base,
+			       const char *name, int len)
 {
-	struct qstr this;
 	unsigned int c;
-	int err;
-
-	WARN_ON_ONCE(!inode_is_locked(base->d_inode));
 
-	this.name = name;
-	this.len = len;
-	this.hash = full_name_hash(base, name, len);
+	this->name = name;
+	this->len = len;
+	this->hash = full_name_hash(base, name, len);
 	if (!len)
-		return ERR_PTR(-EACCES);
+		return -EACCES;
 
 	if (unlikely(name[0] == '.')) {
 		if (len < 2 || (len == 2 && name[1] == '.'))
-			return ERR_PTR(-EACCES);
+			return -EACCES;
 	}
 
 	while (len--) {
 		c = *(const unsigned char *)name++;
 		if (c == '/' || c == '\0')
-			return ERR_PTR(-EACCES);
+			return -EACCES;
 	}
 	/*
 	 * See if the low-level filesystem might want
 	 * to use its own hash..
 	 */
 	if (base->d_flags & DCACHE_OP_HASH) {
-		int err = base->d_op->d_hash(base, &this);
+		int err = base->d_op->d_hash(base, this);
+
 		if (err < 0)
-			return ERR_PTR(err);
+			return err;
 	}
+	return 0;
+}
+
+/**
+ * lookup_one_len - filesystem helper to lookup single pathname component
+ * @name:	pathname component to lookup
+ * @base:	base directory to lookup from
+ * @len:	maximum length @len should be interpreted to
+ *
+ * Note that this routine is purely a helper for filesystem usage and should
+ * not be called by generic code.
+ *
+ * The caller must hold base->i_mutex.
+ */
+struct dentry *lookup_one_len(const char *name, struct dentry *base, int len)
+{
+	struct qstr this;
+	int err;
+
+	WARN_ON_ONCE(!inode_is_locked(base->d_inode));
+
+	err = lookup_one_len_init(&this, base, name, len);
+	if (err)
+		return ERR_PTR(err);
 
 	err = inode_permission(base->d_inode, MAY_EXEC);
 	if (err)
@@ -2515,35 +2526,12 @@ struct dentry *lookup_one_len_unlocked(const char *name,
 				       struct dentry *base, int len)
 {
 	struct qstr this;
-	unsigned int c;
 	int err;
 	struct dentry *ret;
 
-	this.name = name;
-	this.len = len;
-	this.hash = full_name_hash(base, name, len);
-	if (!len)
-		return ERR_PTR(-EACCES);
-
-	if (unlikely(name[0] == '.')) {
-		if (len < 2 || (len == 2 && name[1] == '.'))
-			return ERR_PTR(-EACCES);
-	}
-
-	while (len--) {
-		c = *(const unsigned char *)name++;
-		if (c == '/' || c == '\0')
-			return ERR_PTR(-EACCES);
-	}
-	/*
-	 * See if the low-level filesystem might want
-	 * to use its own hash..
-	 */
-	if (base->d_flags & DCACHE_OP_HASH) {
-		int err = base->d_op->d_hash(base, &this);
-		if (err < 0)
-			return ERR_PTR(err);
-	}
+	err = lookup_one_len_init(&this, base, name, len);
+	if (err)
+		return ERR_PTR(err);
 
 	err = inode_permission(base->d_inode, MAY_EXEC);
 	if (err)
-- 
2.7.4

  parent reply	other threads:[~2017-06-01  9:02 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-01  9:02 [PATCH v3 0/5] ovl: constant inode numbers (cont.) Amir Goldstein
2017-06-01  9:02 ` [PATCH v3 1/5] ovl: relax same fs constrain for ovl_check_origin() Amir Goldstein
2017-06-01  9:02 ` [PATCH v3 2/5] ovl: relax same fs constrain for constant st_ino Amir Goldstein
2017-06-01 12:30   ` Chandan Rajendra
2017-06-01 13:32     ` Amir Goldstein
2017-06-01 19:55   ` Miklos Szeredi
2017-06-02  6:32     ` Amir Goldstein
2017-06-02 12:27       ` Miklos Szeredi
2017-06-02 13:23         ` Amir Goldstein
2017-06-02 13:26           ` Miklos Szeredi
2017-06-02 13:34             ` Amir Goldstein
2017-06-01  9:02 ` Amir Goldstein [this message]
2017-06-01  9:02 ` [PATCH v3 4/5] vfs: add helper lookup_one_len_noperm() Amir Goldstein
2017-06-05 12:36   ` Amir Goldstein
2017-06-01  9:02 ` [PATCH v3 5/5] ovl: consistent st_ino/d_ino Amir Goldstein
2017-06-20 21:25   ` Miklos Szeredi
2017-06-21  8:03     ` Amir Goldstein
2017-06-21  8:20       ` Miklos Szeredi
2017-06-21  8:38         ` Miklos Szeredi
2017-06-21  8:45           ` Miklos Szeredi
2017-06-21  8:49             ` Amir Goldstein
2017-06-21  8:53               ` Miklos Szeredi
2017-06-21  9:05                 ` Amir Goldstein
2017-06-21  9:20                   ` Miklos Szeredi
2017-06-21  9:36                     ` Amir Goldstein
2017-06-21  9:38                       ` Amir Goldstein
2017-06-21  9:48                       ` Miklos Szeredi
2017-06-23 13:56                         ` Amir Goldstein
2017-06-30 16:23                         ` Chandan Rajendra
2017-06-30 19:01                           ` Amir Goldstein
2017-07-27 20:00                         ` Miklos Szeredi
2017-07-28  9:25                           ` Amir Goldstein
2017-07-29 10:33                             ` Amir Goldstein
2017-07-31 10:58                               ` Miklos Szeredi
2017-08-16 11:16                                 ` Amir Goldstein
2017-07-29 11:26                             ` Chandan Rajendra
2017-08-03  7:18                             ` Chandan Rajendra
2017-08-03  9:53                               ` Chandan Rajendra

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=1496307779-2766-4-git-send-email-amir73il@gmail.com \
    --to=amir73il@gmail.com \
    --cc=chandan@linux.vnet.ibm.com \
    --cc=linux-unionfs@vger.kernel.org \
    --cc=miklos@szeredi.hu \
    /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.