fs/adfs: dir: add more efficient iterate() per-format method

Rather than using setpos + getnext to iterate through the directory
entries, pass iterate() down to the dir format code to populate the
dirents.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/adfs/adfs.h b/fs/adfs/adfs.h
index 01d065937c015e1e779eeca6602b80a23c9ffa96..cbf33f375e0b83ae40bf3ee3eca0887db3a79a3f 100644 (file)
--- a/fs/adfs/adfs.h
+++ b/fs/adfs/adfs.h
@@ -120,6 +120,7 @@ struct object_info {
 struct adfs_dir_ops {
        int     (*read)(struct super_block *sb, unsigned int indaddr,
                        unsigned int size, struct adfs_dir *dir);
+       int     (*iterate)(struct adfs_dir *dir, struct dir_context *ctx);
        int     (*setpos)(struct adfs_dir *dir, unsigned int fpos);
        int     (*getnext)(struct adfs_dir *dir, struct object_info *obj);
        int     (*update)(struct adfs_dir *dir, struct object_info *obj);

diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c
index 2a8f5f1fd3d0c7f742b2b8ef64fface21e59d089..7fda44464121efcf4dbceeb2eff0f2cdb82c0322 100644 (file)
--- a/fs/adfs/dir.c
+++ b/fs/adfs/dir.c
@@ -240,12 +240,8 @@ static int adfs_iterate(struct file *file, struct dir_context *ctx)
        struct inode *inode = file_inode(file);
        struct super_block *sb = inode->i_sb;
        const struct adfs_dir_ops *ops = ADFS_SB(sb)->s_dir;
-       struct object_info obj;
        struct adfs_dir dir;
-       int ret = 0;
-
-       if (ctx->pos >> 32)
-               return 0;
+       int ret;
 
        down_read(&adfs_dir_rwsem);
        ret = adfs_dir_read_inode(sb, inode, &dir);
@@ -263,15 +259,7 @@ static int adfs_iterate(struct file *file, struct dir_context *ctx)
                ctx->pos = 2;
        }
 
-       ret = ops->setpos(&dir, ctx->pos - 2);
-       if (ret)
-               goto unlock_relse;
-       while (ops->getnext(&dir, &obj) == 0) {
-               if (!dir_emit(ctx, obj.name, obj.name_len,
-                             obj.indaddr, DT_UNKNOWN))
-                       break;
-               ctx->pos++;
-       }
+       ret = ops->iterate(&dir, ctx);
 
 unlock_relse:
        up_read(&adfs_dir_rwsem);

diff --git a/fs/adfs/dir_f.c b/fs/adfs/dir_f.c
index 682df46d8d3320bc929c2cbff7d55d1c32370c6d..2e342871d6df213d63a0dbbc5c765536d1e3f2ed 100644 (file)
--- a/fs/adfs/dir_f.c
+++ b/fs/adfs/dir_f.c
@@ -302,6 +302,23 @@ adfs_f_getnext(struct adfs_dir *dir, struct object_info *obj)
        return ret;
 }
 
+static int adfs_f_iterate(struct adfs_dir *dir, struct dir_context *ctx)
+{
+       struct object_info obj;
+       int pos = 5 + (ctx->pos - 2) * 26;
+
+       while (ctx->pos < 2 + ADFS_NUM_DIR_ENTRIES) {
+               if (__adfs_dir_get(dir, pos, &obj))
+                       break;
+               if (!dir_emit(ctx, obj.name, obj.name_len,
+                             obj.indaddr, DT_UNKNOWN))
+                       break;
+               pos += 26;
+               ctx->pos++;
+       }
+       return 0;
+}
+
 static int
 adfs_f_update(struct adfs_dir *dir, struct object_info *obj)
 {
@@ -359,6 +376,7 @@ bad_dir:
 
 const struct adfs_dir_ops adfs_f_dir_ops = {
        .read           = adfs_f_read,
+       .iterate        = adfs_f_iterate,
        .setpos         = adfs_f_setpos,
        .getnext        = adfs_f_getnext,
        .update         = adfs_f_update,

diff --git a/fs/adfs/dir_fplus.c b/fs/adfs/dir_fplus.c
index ae11236515d03bc276c6f3110d5a666c791ae53f..edcbaa94ecb9eedac402b184100628880fd85a71 100644 (file)
--- a/fs/adfs/dir_fplus.c
+++ b/fs/adfs/dir_fplus.c
@@ -118,8 +118,29 @@ adfs_fplus_getnext(struct adfs_dir *dir, struct object_info *obj)
        return 0;
 }
 
+static int adfs_fplus_iterate(struct adfs_dir *dir, struct dir_context *ctx)
+{
+       struct object_info obj;
+
+       if ((ctx->pos - 2) >> 32)
+               return 0;
+
+       if (adfs_fplus_setpos(dir, ctx->pos - 2))
+               return 0;
+
+       while (!adfs_fplus_getnext(dir, &obj)) {
+               if (!dir_emit(ctx, obj.name, obj.name_len,
+                             obj.indaddr, DT_UNKNOWN))
+                       break;
+               ctx->pos++;
+       }
+
+       return 0;
+}
+
 const struct adfs_dir_ops adfs_fplus_dir_ops = {
        .read           = adfs_fplus_read,
+       .iterate        = adfs_fplus_iterate,
        .setpos         = adfs_fplus_setpos,
        .getnext        = adfs_fplus_getnext,
 };