erofs: get rid of erofs_kmap_type

Since EROFS_KMAP_ATOMIC is no longer valid, get rid of erofs_kmap_type too.

Signed-off-by: Bo Liu <liubo03@inspur.com>
Reviewed-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Link: https://lore.kernel.org/r/20250217093141.2659-1-liubo03@inspur.com
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>

diff --git a/fs/erofs/data.c b/fs/erofs/data.c
index 0cd6b5c4df9851334f7e858841c60fb5a5f80851..1d2cb0fa1bafd99632cccc017c14528cf04dac95 100644 (file)
--- a/fs/erofs/data.c
+++ b/fs/erofs/data.c
@@ -25,8 +25,7 @@ void erofs_put_metabuf(struct erofs_buf *buf)
        buf->page = NULL;
 }
 
-void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset,
-                 enum erofs_kmap_type type)
+void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset, bool need_kmap)
 {
        pgoff_t index = offset >> PAGE_SHIFT;
        struct folio *folio = NULL;
@@ -43,10 +42,10 @@ void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset,
                        return folio;
        }
        buf->page = folio_file_page(folio, index);
-       if (!buf->base && type == EROFS_KMAP)
-               buf->base = kmap_local_page(buf->page);
-       if (type == EROFS_NO_KMAP)
+       if (!need_kmap)
                return NULL;
+       if (!buf->base)
+               buf->base = kmap_local_page(buf->page);
        return buf->base + (offset & ~PAGE_MASK);
 }
 
@@ -65,10 +64,10 @@ void erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb)
 }
 
 void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb,
-                        erofs_off_t offset, enum erofs_kmap_type type)
+                        erofs_off_t offset, bool need_kmap)
 {
        erofs_init_metabuf(buf, sb);
-       return erofs_bread(buf, offset, type);
+       return erofs_bread(buf, offset, need_kmap);
 }
 
 static int erofs_map_blocks_flatmode(struct inode *inode,
@@ -135,7 +134,7 @@ int erofs_map_blocks(struct inode *inode, struct erofs_map_blocks *map)
        pos = ALIGN(erofs_iloc(inode) + vi->inode_isize +
                    vi->xattr_isize, unit) + unit * chunknr;
 
-       kaddr = erofs_read_metabuf(&buf, sb, pos, EROFS_KMAP);
+       kaddr = erofs_read_metabuf(&buf, sb, pos, true);
        if (IS_ERR(kaddr)) {
                err = PTR_ERR(kaddr);
                goto out;
@@ -312,7 +311,7 @@ static int erofs_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
                struct erofs_buf buf = __EROFS_BUF_INITIALIZER;
 
                iomap->type = IOMAP_INLINE;
-               ptr = erofs_read_metabuf(&buf, sb, mdev.m_pa, EROFS_KMAP);
+               ptr = erofs_read_metabuf(&buf, sb, mdev.m_pa, true);
                if (IS_ERR(ptr))
                        return PTR_ERR(ptr);
                iomap->inline_data = ptr;

diff --git a/fs/erofs/dir.c b/fs/erofs/dir.c
index c3b90abdee37af537514449a6b25baae314e04eb..1d3bb8746ab163e4a6051db7de4bdcc2735e6987 100644 (file)
--- a/fs/erofs/dir.c
+++ b/fs/erofs/dir.c
@@ -58,7 +58,7 @@ static int erofs_readdir(struct file *f, struct dir_context *ctx)
                struct erofs_dirent *de;
                unsigned int nameoff, maxsize;
 
-               de = erofs_bread(&buf, dbstart, EROFS_KMAP);
+               de = erofs_bread(&buf, dbstart, true);
                if (IS_ERR(de)) {
                        erofs_err(sb, "fail to readdir of logical block %u of nid %llu",
                                  erofs_blknr(sb, dbstart), EROFS_I(dir)->nid);

diff --git a/fs/erofs/fileio.c b/fs/erofs/fileio.c
index 0ffd1c63beeb9872b575fbbf162ba6a065eb5cd6..bec4b56b3826518b8d3b76630b3cf914d7bb3194 100644 (file)
--- a/fs/erofs/fileio.c
+++ b/fs/erofs/fileio.c
@@ -112,7 +112,7 @@ static int erofs_fileio_scan_folio(struct erofs_fileio *io, struct folio *folio)
                        void *src;
 
                        src = erofs_read_metabuf(&buf, inode->i_sb,
-                                                map->m_pa + ofs, EROFS_KMAP);
+                                                map->m_pa + ofs, true);
                        if (IS_ERR(src)) {
                                err = PTR_ERR(src);
                                break;

diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
index ce3d8737df85d4c5186fbba862161294e1354674..9c9129bca3460b8a0e5646720626c42e3986f658 100644 (file)
--- a/fs/erofs/fscache.c
+++ b/fs/erofs/fscache.c
@@ -276,7 +276,7 @@ static int erofs_fscache_data_read_slice(struct erofs_fscache_rq *req)
                size_t size = map.m_llen;
                void *src;
 
-               src = erofs_read_metabuf(&buf, sb, map.m_pa, EROFS_KMAP);
+               src = erofs_read_metabuf(&buf, sb, map.m_pa, true);
                if (IS_ERR(src))
                        return PTR_ERR(src);
 

diff --git a/fs/erofs/inode.c b/fs/erofs/inode.c
index d4b89407822a753eb7f520805f65cdb60f96bc45..4936bd43c438a49832e64d729e287c4384adce48 100644 (file)
--- a/fs/erofs/inode.c
+++ b/fs/erofs/inode.c
@@ -42,7 +42,7 @@ static int erofs_read_inode(struct inode *inode)
        blkaddr = erofs_blknr(sb, inode_loc);
        ofs = erofs_blkoff(sb, inode_loc);
 
-       kaddr = erofs_read_metabuf(&buf, sb, erofs_pos(sb, blkaddr), EROFS_KMAP);
+       kaddr = erofs_read_metabuf(&buf, sb, erofs_pos(sb, blkaddr), true);
        if (IS_ERR(kaddr)) {
                erofs_err(sb, "failed to get inode (nid: %llu) page, err %ld",
                          vi->nid, PTR_ERR(kaddr));
@@ -82,8 +82,8 @@ static int erofs_read_inode(struct inode *inode)
                                goto err_out;
                        }
                        memcpy(copied, dic, gotten);
-                       kaddr = erofs_read_metabuf(&buf, sb, erofs_pos(sb, blkaddr + 1),
-                                                  EROFS_KMAP);
+                       kaddr = erofs_read_metabuf(&buf, sb,
+                                       erofs_pos(sb, blkaddr + 1), true);
                        if (IS_ERR(kaddr)) {
                                erofs_err(sb, "failed to get inode payload block (nid: %llu), err %ld",
                                          vi->nid, PTR_ERR(kaddr));

diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index 686d835eb533accfdff6d8731c815ace510523c6..f955793146f40cbc47f589b14d3572a8f0d39ae3 100644 (file)
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -199,11 +199,6 @@ enum {
        EROFS_ZIP_CACHE_READAROUND
 };
 
-enum erofs_kmap_type {
-       EROFS_NO_KMAP,          /* don't map the buffer */
-       EROFS_KMAP,             /* use kmap_local_page() to map the buffer */
-};
-
 struct erofs_buf {
        struct address_space *mapping;
        struct file *file;
@@ -387,11 +382,10 @@ void *erofs_read_metadata(struct super_block *sb, struct erofs_buf *buf,
                          erofs_off_t *offset, int *lengthp);
 void erofs_unmap_metabuf(struct erofs_buf *buf);
 void erofs_put_metabuf(struct erofs_buf *buf);
-void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset,
-                 enum erofs_kmap_type type);
+void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset, bool need_kmap);
 void erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb);
 void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb,
-                        erofs_off_t offset, enum erofs_kmap_type type);
+                        erofs_off_t offset, bool need_kmap);
 int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *dev);
 int erofs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
                 u64 start, u64 len);

diff --git a/fs/erofs/namei.c b/fs/erofs/namei.c
index c94d0c1608a81e2383185f854f5d0ca5303f113e..f7cf4f41af288c905e34d5421a5149127cebac0c 100644 (file)
--- a/fs/erofs/namei.c
+++ b/fs/erofs/namei.c
@@ -100,7 +100,7 @@ static void *erofs_find_target_block(struct erofs_buf *target,
                struct erofs_dirent *de;
 
                buf.mapping = dir->i_mapping;
-               de = erofs_bread(&buf, erofs_pos(dir->i_sb, mid), EROFS_KMAP);
+               de = erofs_bread(&buf, erofs_pos(dir->i_sb, mid), true);
                if (!IS_ERR(de)) {
                        const int nameoff = nameoff_from_disk(de->nameoff, bsz);
                        const int ndirents = nameoff / sizeof(*de);

diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 827b6266564944bcf94a0952f99d907a7dbd4f63..3dc86d931ef152530205c16a34fc5a622989c7f6 100644 (file)
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -94,7 +94,7 @@ void *erofs_read_metadata(struct super_block *sb, struct erofs_buf *buf,
        int len, i, cnt;
 
        *offset = round_up(*offset, 4);
-       ptr = erofs_bread(buf, *offset, EROFS_KMAP);
+       ptr = erofs_bread(buf, *offset, true);
        if (IS_ERR(ptr))
                return ptr;
 
@@ -110,7 +110,7 @@ void *erofs_read_metadata(struct super_block *sb, struct erofs_buf *buf,
        for (i = 0; i < len; i += cnt) {
                cnt = min_t(int, sb->s_blocksize - erofs_blkoff(sb, *offset),
                            len - i);
-               ptr = erofs_bread(buf, *offset, EROFS_KMAP);
+               ptr = erofs_bread(buf, *offset, true);
                if (IS_ERR(ptr)) {
                        kfree(buffer);
                        return ptr;
@@ -141,7 +141,7 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,
        struct erofs_deviceslot *dis;
        struct file *file;
 
-       dis = erofs_read_metabuf(buf, sb, *pos, EROFS_KMAP);
+       dis = erofs_read_metabuf(buf, sb, *pos, true);
        if (IS_ERR(dis))
                return PTR_ERR(dis);
 
@@ -255,7 +255,7 @@ static int erofs_read_superblock(struct super_block *sb)
        void *data;
        int ret;
 
-       data = erofs_read_metabuf(&buf, sb, 0, EROFS_KMAP);
+       data = erofs_read_metabuf(&buf, sb, 0, true);
        if (IS_ERR(data)) {
                erofs_err(sb, "cannot read erofs superblock");
                return PTR_ERR(data);

diff --git a/fs/erofs/xattr.c b/fs/erofs/xattr.c
index df2777e0566190a611b5cfc3d761184389e329f9..9cf84717a92e217137930eddfb477bd16951b398 100644 (file)
--- a/fs/erofs/xattr.c
+++ b/fs/erofs/xattr.c
@@ -81,7 +81,7 @@ static int erofs_init_inode_xattrs(struct inode *inode)
        it.pos = erofs_iloc(inode) + vi->inode_isize;
 
        /* read in shared xattr array (non-atomic, see kmalloc below) */
-       it.kaddr = erofs_bread(&it.buf, it.pos, EROFS_KMAP);
+       it.kaddr = erofs_bread(&it.buf, it.pos, true);
        if (IS_ERR(it.kaddr)) {
                ret = PTR_ERR(it.kaddr);
                goto out_unlock;
@@ -102,7 +102,7 @@ static int erofs_init_inode_xattrs(struct inode *inode)
        it.pos += sizeof(struct erofs_xattr_ibody_header);
 
        for (i = 0; i < vi->xattr_shared_count; ++i) {
-               it.kaddr = erofs_bread(&it.buf, it.pos, EROFS_KMAP);
+               it.kaddr = erofs_bread(&it.buf, it.pos, true);
                if (IS_ERR(it.kaddr)) {
                        kfree(vi->xattr_shared_xattrs);
                        vi->xattr_shared_xattrs = NULL;
@@ -183,7 +183,7 @@ static int erofs_xattr_copy_to_buffer(struct erofs_xattr_iter *it,
        void *src;
 
        for (processed = 0; processed < len; processed += slice) {
-               it->kaddr = erofs_bread(&it->buf, it->pos, EROFS_KMAP);
+               it->kaddr = erofs_bread(&it->buf, it->pos, true);
                if (IS_ERR(it->kaddr))
                        return PTR_ERR(it->kaddr);
 
@@ -286,7 +286,7 @@ static int erofs_getxattr_foreach(struct erofs_xattr_iter *it)
 
        /* 2. handle xattr name */
        for (processed = 0; processed < entry.e_name_len; processed += slice) {
-               it->kaddr = erofs_bread(&it->buf, it->pos, EROFS_KMAP);
+               it->kaddr = erofs_bread(&it->buf, it->pos, true);
                if (IS_ERR(it->kaddr))
                        return PTR_ERR(it->kaddr);
 
@@ -330,7 +330,7 @@ static int erofs_xattr_iter_inline(struct erofs_xattr_iter *it,
        it->pos = erofs_iloc(inode) + vi->inode_isize + xattr_header_sz;
 
        while (remaining) {
-               it->kaddr = erofs_bread(&it->buf, it->pos, EROFS_KMAP);
+               it->kaddr = erofs_bread(&it->buf, it->pos, true);
                if (IS_ERR(it->kaddr))
                        return PTR_ERR(it->kaddr);
 
@@ -367,7 +367,7 @@ static int erofs_xattr_iter_shared(struct erofs_xattr_iter *it,
        for (i = 0; i < vi->xattr_shared_count; ++i) {
                it->pos = erofs_pos(sb, sbi->xattr_blkaddr) +
                                vi->xattr_shared_xattrs[i] * sizeof(__le32);
-               it->kaddr = erofs_bread(&it->buf, it->pos, EROFS_KMAP);
+               it->kaddr = erofs_bread(&it->buf, it->pos, true);
                if (IS_ERR(it->kaddr))
                        return PTR_ERR(it->kaddr);
 

diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
index d771e06db738682501abb5f9a94cf5d764ec5572..ad674eee400a36e3a9b20527b83b6dd4d58e32bc 100644 (file)
--- a/fs/erofs/zdata.c
+++ b/fs/erofs/zdata.c
@@ -832,7 +832,7 @@ static int z_erofs_pcluster_begin(struct z_erofs_frontend *fe)
        } else {
                void *mptr;
 
-               mptr = erofs_read_metabuf(&map->buf, sb, map->m_pa, EROFS_NO_KMAP);
+               mptr = erofs_read_metabuf(&map->buf, sb, map->m_pa, false);
                if (IS_ERR(mptr)) {
                        ret = PTR_ERR(mptr);
                        erofs_err(sb, "failed to get inline data %d", ret);
@@ -967,7 +967,7 @@ static int z_erofs_read_fragment(struct super_block *sb, struct folio *folio,
        buf.mapping = packed_inode->i_mapping;
        for (; cur < end; cur += cnt, pos += cnt) {
                cnt = min(end - cur, sb->s_blocksize - erofs_blkoff(sb, pos));
-               src = erofs_bread(&buf, pos, EROFS_KMAP);
+               src = erofs_bread(&buf, pos, true);
                if (IS_ERR(src)) {
                        erofs_put_metabuf(&buf);
                        return PTR_ERR(src);

diff --git a/fs/erofs/zmap.c b/fs/erofs/zmap.c
index d278ebd6028164b508cd128c97b151e7527e2bb7..a0c1c6450a55731b59e1303ac05073af6f55e74f 100644 (file)
--- a/fs/erofs/zmap.c
+++ b/fs/erofs/zmap.c
@@ -31,7 +31,7 @@ static int z_erofs_load_full_lcluster(struct z_erofs_maprecorder *m,
        struct z_erofs_lcluster_index *di;
        unsigned int advise;
 
-       di = erofs_read_metabuf(&m->map->buf, inode->i_sb, pos, EROFS_KMAP);
+       di = erofs_read_metabuf(&m->map->buf, inode->i_sb, pos, true);
        if (IS_ERR(di))
                return PTR_ERR(di);
        m->lcn = lcn;
@@ -146,7 +146,7 @@ static int z_erofs_load_compact_lcluster(struct z_erofs_maprecorder *m,
        else
                return -EOPNOTSUPP;
 
-       in = erofs_read_metabuf(&m->map->buf, m->inode->i_sb, pos, EROFS_KMAP);
+       in = erofs_read_metabuf(&m->map->buf, m->inode->i_sb, pos, true);
        if (IS_ERR(in))
                return PTR_ERR(in);
 
@@ -546,7 +546,7 @@ static int z_erofs_fill_inode_lazy(struct inode *inode)
                goto out_unlock;
 
        pos = ALIGN(erofs_iloc(inode) + vi->inode_isize + vi->xattr_isize, 8);
-       h = erofs_read_metabuf(&buf, sb, pos, EROFS_KMAP);
+       h = erofs_read_metabuf(&buf, sb, pos, true);
        if (IS_ERR(h)) {
                err = PTR_ERR(h);
                goto out_unlock;