merge common parts of lookup_one_len{,_unlocked} into common helper

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/namei.c b/fs/namei.c
index a3cd028..b803c6c 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2417,52 +2417,57 @@ 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_common(const char *name, struct dentry *base,
+                                int len, struct qstr *this)
 {
-       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++;
+               unsigned int 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;
        }
 
-       err = inode_permission(base->d_inode, MAY_EXEC);
+       return inode_permission(base->d_inode, MAY_EXEC);
+}
+
+/**
+ * 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_common(name, base, len, &this);
        if (err)
                return ERR_PTR(err);
 
@@ -2486,37 +2491,10 @@ 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 = inode_permission(base->d_inode, MAY_EXEC);
+       err = lookup_one_len_common(name, base, len, &this);
        if (err)
                return ERR_PTR(err);