1 files changed, 55 insertions, 82 deletions

diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 7aabc6ad4e9b..277bd1be21fd 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -387,7 +387,7 @@ static void remove_dir(struct dentry * d)
         if (d->d_inode)
                 simple_rmdir(parent->d_inode,d);
 
-        pr_debug(" o %s removing done (%d)\n",d->d_name.name, d->d_count);
+        pr_debug(" o %s removing done (%d)\n",d->d_name.name, d_count(d));
 
         dput(parent);
 }
@@ -660,19 +660,15 @@ static int create_default_group(struct config_group *parent_group,
                                 struct config_group *group)
 {
         int ret;
-        struct qstr name;
         struct configfs_dirent *sd;
         /* We trust the caller holds a reference to parent */
         struct dentry *child, *parent = parent_group->cg_item.ci_dentry;
 
         if (!group->cg_item.ci_name)
                 group->cg_item.ci_name = group->cg_item.ci_namebuf;
-        name.name = group->cg_item.ci_name;
-        name.len = strlen(name.name);
-        name.hash = full_name_hash(name.name, name.len);
 
         ret = -ENOMEM;
-        child = d_alloc(parent, &name);
+        child = d_alloc_name(parent, group->cg_item.ci_name);
         if (child) {
                 d_add(child, NULL);
 
@@ -1532,84 +1528,66 @@ static inline unsigned char dt_type(struct configfs_dirent *sd)
         return (sd->s_mode >> 12) & 15;
 }
 
-static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir)
+static int configfs_readdir(struct file *file, struct dir_context *ctx)
 {
-        struct dentry *dentry = filp->f_path.dentry;
+        struct dentry *dentry = file->f_path.dentry;
         struct super_block *sb = dentry->d_sb;
         struct configfs_dirent * parent_sd = dentry->d_fsdata;
-        struct configfs_dirent *cursor = filp->private_data;
+        struct configfs_dirent *cursor = file->private_data;
         struct list_head *p, *q = &cursor->s_sibling;
         ino_t ino = 0;
-        int i = filp->f_pos;
 
-        switch (i) {
-                case 0:
-                        ino = dentry->d_inode->i_ino;
-                        if (filldir(dirent, ".", 1, i, ino, DT_DIR) < 0)
-                                break;
-                        filp->f_pos++;
-                        i++;
-                        /* fallthrough */
-                case 1:
-                        ino = parent_ino(dentry);
-                        if (filldir(dirent, "..", 2, i, ino, DT_DIR) < 0)
-                                break;
-                        filp->f_pos++;
-                        i++;
-                        /* fallthrough */
-                default:
-                        if (filp->f_pos == 2) {
-                                spin_lock(&configfs_dirent_lock);
-                                list_move(q, &parent_sd->s_children);
-                                spin_unlock(&configfs_dirent_lock);
-                        }
-                        for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
-                                struct configfs_dirent *next;
-                                const char * name;
-                                int len;
-                                struct inode *inode = NULL;
+        if (!dir_emit_dots(file, ctx))
+                return 0;
+        if (ctx->pos == 2) {
+                spin_lock(&configfs_dirent_lock);
+                list_move(q, &parent_sd->s_children);
+                spin_unlock(&configfs_dirent_lock);
+        }
+        for (p = q->next; p != &parent_sd->s_children; p = p->next) {
+                struct configfs_dirent *next;
+                const char *name;
+                int len;
+                struct inode *inode = NULL;
+
+                next = list_entry(p, struct configfs_dirent, s_sibling);
+                if (!next->s_element)
+                        continue;
 
-                                next = list_entry(p, struct configfs_dirent,
-                                                   s_sibling);
-                                if (!next->s_element)
-                                        continue;
-
-                                name = configfs_get_name(next);
-                                len = strlen(name);
-
-                                /*
-                                 * We'll have a dentry and an inode for
-                                 * PINNED items and for open attribute
-                                 * files.  We lock here to prevent a race
-                                 * with configfs_d_iput() clearing
-                                 * s_dentry before calling iput().
-                                 *
-                                 * Why do we go to the trouble?  If
-                                 * someone has an attribute file open,
-                                 * the inode number should match until
-                                 * they close it.  Beyond that, we don't
-                                 * care.
-                                 */
-                                spin_lock(&configfs_dirent_lock);
-                                dentry = next->s_dentry;
-                                if (dentry)
-                                        inode = dentry->d_inode;
-                                if (inode)
-                                        ino = inode->i_ino;
-                                spin_unlock(&configfs_dirent_lock);
-                                if (!inode)
-                                        ino = iunique(sb, 2);
+                name = configfs_get_name(next);
+                len = strlen(name);
 
-                                if (filldir(dirent, name, len, filp->f_pos, ino,
-                                                 dt_type(next)) < 0)
-                                        return 0;
+                /*
+                 * We'll have a dentry and an inode for
+                 * PINNED items and for open attribute
+                 * files.  We lock here to prevent a race
+                 * with configfs_d_iput() clearing
+                 * s_dentry before calling iput().
+                 *
+                 * Why do we go to the trouble?  If
+                 * someone has an attribute file open,
+                 * the inode number should match until
+                 * they close it.  Beyond that, we don't
+                 * care.
+                 */
+                spin_lock(&configfs_dirent_lock);
+                dentry = next->s_dentry;
+                if (dentry)
+                        inode = dentry->d_inode;
+                if (inode)
+                        ino = inode->i_ino;
+                spin_unlock(&configfs_dirent_lock);
+                if (!inode)
+                        ino = iunique(sb, 2);
 
-                                spin_lock(&configfs_dirent_lock);
-                                list_move(q, p);
-                                spin_unlock(&configfs_dirent_lock);
-                                p = q;
-                                filp->f_pos++;
-                        }
+                if (!dir_emit(ctx, name, len, ino, dt_type(next)))
+                        return 0;
+
+                spin_lock(&configfs_dirent_lock);
+                list_move(q, p);
+                spin_unlock(&configfs_dirent_lock);
+                p = q;
+                ctx->pos++;
         }
         return 0;
 }
@@ -1661,14 +1639,13 @@ const struct file_operations configfs_dir_operations = {
         .release        = configfs_dir_close,
         .llseek         = configfs_dir_lseek,
         .read           = generic_read_dir,
-        .readdir        = configfs_readdir,
+        .iterate        = configfs_readdir,
 };
 
 int configfs_register_subsystem(struct configfs_subsystem *subsys)
 {
         int err;
         struct config_group *group = &subsys->su_group;
-        struct qstr name;
         struct dentry *dentry;
         struct dentry *root;
         struct configfs_dirent *sd;
@@ -1685,12 +1662,8 @@ int configfs_register_subsystem(struct configfs_subsystem *subsys)
 
         mutex_lock_nested(&root->d_inode->i_mutex, I_MUTEX_PARENT);
 
-        name.name = group->cg_item.ci_name;
-        name.len = strlen(name.name);
-        name.hash = full_name_hash(name.name, name.len);
-
         err = -ENOMEM;
-        dentry = d_alloc(root, &name);
+        dentry = d_alloc_name(root, group->cg_item.ci_name);
         if (dentry) {
                 d_add(dentry, NULL);