[PATCH 1/2] erofs-utils: lib: clean up zmap.c

[Gao Xiang]

Let's keep in sync with kernel commit 8241fdd3cdfe ("erofs: clean up
zmap.c").

Signed-off-by: Gao Xiang <hsiang...@linux.alibaba.com>
---
 lib/zmap.c | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/lib/zmap.c b/lib/zmap.c
index a5c5b00..e04a99a 100644
--- a/lib/zmap.c
+++ b/lib/zmap.c
@@ -142,8 +142,8 @@ static int z_erofs_reload_indexes(struct 
z_erofs_maprecorder *m,
        return 0;
 }
 
-static int legacy_load_cluster_from_disk(struct z_erofs_maprecorder *m,
-                                        unsigned long lcn)
+static int z_erofs_load_full_lcluster(struct z_erofs_maprecorder *m,
+                                     unsigned long lcn)
 {
        struct erofs_inode *const vi = m->inode;
        struct erofs_sb_info *sbi = vi->sbi;
@@ -337,8 +337,8 @@ static int unpack_compacted_index(struct 
z_erofs_maprecorder *m,
        return 0;
 }
 
-static int compacted_load_cluster_from_disk(struct z_erofs_maprecorder *m,
-                                           unsigned long lcn, bool lookahead)
+static int z_erofs_load_compact_lcluster(struct z_erofs_maprecorder *m,
+                                        unsigned long lcn, bool lookahead)
 {
        struct erofs_inode *const vi = m->inode;
        struct erofs_sb_info *sbi = vi->sbi;
@@ -389,18 +389,17 @@ out:
        return unpack_compacted_index(m, amortizedshift, pos, lookahead);
 }
 
-static int z_erofs_load_cluster_from_disk(struct z_erofs_maprecorder *m,
-                                         unsigned int lcn, bool lookahead)
+static int z_erofs_load_lcluster_from_disk(struct z_erofs_maprecorder *m,
+                                          unsigned int lcn, bool lookahead)
 {
-       const unsigned int datamode = m->inode->datalayout;
-
-       if (datamode == EROFS_INODE_COMPRESSED_FULL)
-               return legacy_load_cluster_from_disk(m, lcn);
-
-       if (datamode == EROFS_INODE_COMPRESSED_COMPACT)
-               return compacted_load_cluster_from_disk(m, lcn, lookahead);
-
-       return -EINVAL;
+       switch (m->inode->datalayout) {
+       case EROFS_INODE_COMPRESSED_FULL:
+               return z_erofs_load_full_lcluster(m, lcn);
+       case EROFS_INODE_COMPRESSED_COMPACT:
+               return z_erofs_load_compact_lcluster(m, lcn, lookahead);
+       default:
+               return -EINVAL;
+       }
 }
 
 static int z_erofs_extent_lookback(struct z_erofs_maprecorder *m,
@@ -421,7 +420,7 @@ static int z_erofs_extent_lookback(struct 
z_erofs_maprecorder *m,
 
        /* load extent head logical cluster if needed */
        lcn -= lookback_distance;
-       err = z_erofs_load_cluster_from_disk(m, lcn, false);
+       err = z_erofs_load_lcluster_from_disk(m, lcn, false);
        if (err)
                return err;
 
@@ -471,7 +470,7 @@ static int z_erofs_get_extent_compressedlen(struct 
z_erofs_maprecorder *m,
        if (m->compressedblks)
                goto out;
 
-       err = z_erofs_load_cluster_from_disk(m, lcn, false);
+       err = z_erofs_load_lcluster_from_disk(m, lcn, false);
        if (err)
                return err;
 
@@ -532,7 +531,7 @@ static int z_erofs_get_extent_decompressedlen(struct 
z_erofs_maprecorder *m)
                        return 0;
                }
 
-               err = z_erofs_load_cluster_from_disk(m, lcn, true);
+               err = z_erofs_load_lcluster_from_disk(m, lcn, true);
                if (err)
                        return err;
 
@@ -581,7 +580,7 @@ static int z_erofs_do_map_blocks(struct erofs_inode *vi,
        initial_lcn = ofs >> lclusterbits;
        endoff = ofs & ((1 << lclusterbits) - 1);
 
-       err = z_erofs_load_cluster_from_disk(&m, initial_lcn, false);
+       err = z_erofs_load_lcluster_from_disk(&m, initial_lcn, false);
        if (err)
                goto out;
 
-- 
2.43.5