Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Bo Liu 2025-02-17 04:31:41 -05:00 committed by Gao Xiang
parent 3b7781aeae
commit 706e50e46a
11 changed files with 32 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/erofs/data.c
View File

@ -25,8 +25,7 @@ void erofs_put_metabuf(struct erofs_buf *buf)
buf->page = NULL; buf->page = NULL;
} }
void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset, void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset, bool need_kmap)
enum erofs_kmap_type type)
{ {
pgoff_t index = offset >> PAGE_SHIFT; pgoff_t index = offset >> PAGE_SHIFT;
struct folio *folio = NULL; struct folio *folio = NULL;
@ -43,10 +42,10 @@ void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset,
return folio; return folio;
} }
buf->page = folio_file_page(folio, index); buf->page = folio_file_page(folio, index);
if (!buf->base && type == EROFS_KMAP) if (!need_kmap)
buf->base = kmap_local_page(buf->page);
if (type == EROFS_NO_KMAP)
return NULL; return NULL;
if (!buf->base)
buf->base = kmap_local_page(buf->page);
return buf->base + (offset & ~PAGE_MASK); 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, 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); 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, 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 + pos = ALIGN(erofs_iloc(inode) + vi->inode_isize +
vi->xattr_isize, unit) + unit * chunknr; 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)) { if (IS_ERR(kaddr)) {
err = PTR_ERR(kaddr); err = PTR_ERR(kaddr);
goto out; 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; struct erofs_buf buf = __EROFS_BUF_INITIALIZER;
iomap->type = IOMAP_INLINE; 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)) if (IS_ERR(ptr))
return PTR_ERR(ptr); return PTR_ERR(ptr);
iomap->inline_data = ptr; iomap->inline_data = ptr;

2
fs/erofs/dir.c
View File

@ -58,7 +58,7 @@ static int erofs_readdir(struct file *f, struct dir_context *ctx)
struct erofs_dirent *de; struct erofs_dirent *de;
unsigned int nameoff, maxsize; unsigned int nameoff, maxsize;
de = erofs_bread(&buf, dbstart, EROFS_KMAP); de = erofs_bread(&buf, dbstart, true);
if (IS_ERR(de)) { if (IS_ERR(de)) {
erofs_err(sb, "fail to readdir of logical block %u of nid %llu", erofs_err(sb, "fail to readdir of logical block %u of nid %llu",
erofs_blknr(sb, dbstart), EROFS_I(dir)->nid); erofs_blknr(sb, dbstart), EROFS_I(dir)->nid);

2
fs/erofs/fileio.c
View File

@ -112,7 +112,7 @@ static int erofs_fileio_scan_folio(struct erofs_fileio *io, struct folio *folio)
void *src; void *src;
src = erofs_read_metabuf(&buf, inode->i_sb, src = erofs_read_metabuf(&buf, inode->i_sb,
map->m_pa + ofs, EROFS_KMAP); map->m_pa + ofs, true);
if (IS_ERR(src)) { if (IS_ERR(src)) {
err = PTR_ERR(src); err = PTR_ERR(src);
break; break;

2
fs/erofs/fscache.c
View File

@ -276,7 +276,7 @@ static int erofs_fscache_data_read_slice(struct erofs_fscache_rq *req)
size_t size = map.m_llen; size_t size = map.m_llen;
void *src; 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)) if (IS_ERR(src))
return PTR_ERR(src); return PTR_ERR(src);

6
fs/erofs/inode.c
View File

@ -42,7 +42,7 @@ static int erofs_read_inode(struct inode *inode)
blkaddr = erofs_blknr(sb, inode_loc); blkaddr = erofs_blknr(sb, inode_loc);
ofs = erofs_blkoff(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)) { if (IS_ERR(kaddr)) {
erofs_err(sb, "failed to get inode (nid: %llu) page, err %ld", erofs_err(sb, "failed to get inode (nid: %llu) page, err %ld",
vi->nid, PTR_ERR(kaddr)); vi->nid, PTR_ERR(kaddr));
@ -82,8 +82,8 @@ static int erofs_read_inode(struct inode *inode)
goto err_out; goto err_out;
} }
memcpy(copied, dic, gotten); memcpy(copied, dic, gotten);
kaddr = erofs_read_metabuf(&buf, sb, erofs_pos(sb, blkaddr + 1), kaddr = erofs_read_metabuf(&buf, sb,
EROFS_KMAP); erofs_pos(sb, blkaddr + 1), true);
if (IS_ERR(kaddr)) { if (IS_ERR(kaddr)) {
erofs_err(sb, "failed to get inode payload block (nid: %llu), err %ld", erofs_err(sb, "failed to get inode payload block (nid: %llu), err %ld",
vi->nid, PTR_ERR(kaddr)); vi->nid, PTR_ERR(kaddr));

10
fs/erofs/internal.h
View File

@ -199,11 +199,6 @@ enum {
EROFS_ZIP_CACHE_READAROUND 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 erofs_buf {
struct address_space *mapping; struct address_space *mapping;
struct file *file; 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); erofs_off_t *offset, int *lengthp);
void erofs_unmap_metabuf(struct erofs_buf *buf); void erofs_unmap_metabuf(struct erofs_buf *buf);
void erofs_put_metabuf(struct erofs_buf *buf); void erofs_put_metabuf(struct erofs_buf *buf);
void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset, void *erofs_bread(struct erofs_buf *buf, erofs_off_t offset, bool need_kmap);
enum erofs_kmap_type type);
void erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb); void erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb);
void *erofs_read_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_map_dev(struct super_block *sb, struct erofs_map_dev *dev);
int erofs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, int erofs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
u64 start, u64 len); u64 start, u64 len);

2
fs/erofs/namei.c
View File

@ -100,7 +100,7 @@ static void *erofs_find_target_block(struct erofs_buf *target,
struct erofs_dirent *de; struct erofs_dirent *de;
buf.mapping = dir->i_mapping; 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)) { if (!IS_ERR(de)) {
const int nameoff = nameoff_from_disk(de->nameoff, bsz); const int nameoff = nameoff_from_disk(de->nameoff, bsz);
const int ndirents = nameoff / sizeof(*de); const int ndirents = nameoff / sizeof(*de);

8
fs/erofs/super.c
View File

@ -94,7 +94,7 @@ void *erofs_read_metadata(struct super_block *sb, struct erofs_buf *buf,
int len, i, cnt; int len, i, cnt;
*offset = round_up(*offset, 4); *offset = round_up(*offset, 4);
ptr = erofs_bread(buf, *offset, EROFS_KMAP); ptr = erofs_bread(buf, *offset, true);
if (IS_ERR(ptr)) if (IS_ERR(ptr))
return 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) { for (i = 0; i < len; i += cnt) {
cnt = min_t(int, sb->s_blocksize - erofs_blkoff(sb, *offset), cnt = min_t(int, sb->s_blocksize - erofs_blkoff(sb, *offset),
len - i); len - i);
ptr = erofs_bread(buf, *offset, EROFS_KMAP); ptr = erofs_bread(buf, *offset, true);
if (IS_ERR(ptr)) { if (IS_ERR(ptr)) {
kfree(buffer); kfree(buffer);
return ptr; return ptr;
@ -141,7 +141,7 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,
struct erofs_deviceslot *dis; struct erofs_deviceslot *dis;
struct file *file; struct file *file;
dis = erofs_read_metabuf(buf, sb, *pos, EROFS_KMAP); dis = erofs_read_metabuf(buf, sb, *pos, true);
if (IS_ERR(dis)) if (IS_ERR(dis))
return PTR_ERR(dis); return PTR_ERR(dis);
@ -255,7 +255,7 @@ static int erofs_read_superblock(struct super_block *sb)
void *data; void *data;
int ret; int ret;
data = erofs_read_metabuf(&buf, sb, 0, EROFS_KMAP); data = erofs_read_metabuf(&buf, sb, 0, true);
if (IS_ERR(data)) { if (IS_ERR(data)) {
erofs_err(sb, "cannot read erofs superblock"); erofs_err(sb, "cannot read erofs superblock");
return PTR_ERR(data); return PTR_ERR(data);

12
fs/erofs/xattr.c
View File

@ -81,7 +81,7 @@ static int erofs_init_inode_xattrs(struct inode *inode)
it.pos = erofs_iloc(inode) + vi->inode_isize; it.pos = erofs_iloc(inode) + vi->inode_isize;
/* read in shared xattr array (non-atomic, see kmalloc below) */ /* 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)) { if (IS_ERR(it.kaddr)) {
ret = PTR_ERR(it.kaddr); ret = PTR_ERR(it.kaddr);
goto out_unlock; goto out_unlock;
@ -102,7 +102,7 @@ static int erofs_init_inode_xattrs(struct inode *inode)
it.pos += sizeof(struct erofs_xattr_ibody_header); it.pos += sizeof(struct erofs_xattr_ibody_header);
for (i = 0; i < vi->xattr_shared_count; ++i) { 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)) { if (IS_ERR(it.kaddr)) {
kfree(vi->xattr_shared_xattrs); kfree(vi->xattr_shared_xattrs);
vi->xattr_shared_xattrs = NULL; vi->xattr_shared_xattrs = NULL;
@ -183,7 +183,7 @@ static int erofs_xattr_copy_to_buffer(struct erofs_xattr_iter *it,
void *src; void *src;
for (processed = 0; processed < len; processed += slice) { 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)) if (IS_ERR(it->kaddr))
return PTR_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 */ /* 2. handle xattr name */
for (processed = 0; processed < entry.e_name_len; processed += slice) { 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)) if (IS_ERR(it->kaddr))
return PTR_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; it->pos = erofs_iloc(inode) + vi->inode_isize + xattr_header_sz;
while (remaining) { 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)) if (IS_ERR(it->kaddr))
return PTR_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) { for (i = 0; i < vi->xattr_shared_count; ++i) {
it->pos = erofs_pos(sb, sbi->xattr_blkaddr) + it->pos = erofs_pos(sb, sbi->xattr_blkaddr) +
vi->xattr_shared_xattrs[i] * sizeof(__le32); 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)) if (IS_ERR(it->kaddr))
return PTR_ERR(it->kaddr); return PTR_ERR(it->kaddr);

4
fs/erofs/zdata.c
View File

@ -832,7 +832,7 @@ static int z_erofs_pcluster_begin(struct z_erofs_frontend *fe)
} else { } else {
void *mptr; 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)) { if (IS_ERR(mptr)) {
ret = PTR_ERR(mptr); ret = PTR_ERR(mptr);
erofs_err(sb, "failed to get inline data %d", ret); 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; buf.mapping = packed_inode->i_mapping;
for (; cur < end; cur += cnt, pos += cnt) { for (; cur < end; cur += cnt, pos += cnt) {
cnt = min(end - cur, sb->s_blocksize - erofs_blkoff(sb, pos)); 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)) { if (IS_ERR(src)) {
erofs_put_metabuf(&buf); erofs_put_metabuf(&buf);
return PTR_ERR(src); return PTR_ERR(src);

6
fs/erofs/zmap.c
View File

@ -31,7 +31,7 @@ static int z_erofs_load_full_lcluster(struct z_erofs_maprecorder *m,
struct z_erofs_lcluster_index *di; struct z_erofs_lcluster_index *di;
unsigned int advise; 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)) if (IS_ERR(di))
return PTR_ERR(di); return PTR_ERR(di);
m->lcn = lcn; m->lcn = lcn;
@ -146,7 +146,7 @@ static int z_erofs_load_compact_lcluster(struct z_erofs_maprecorder *m,
else else
return -EOPNOTSUPP; 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)) if (IS_ERR(in))
return PTR_ERR(in); return PTR_ERR(in);
@ -546,7 +546,7 @@ static int z_erofs_fill_inode_lazy(struct inode *inode)
goto out_unlock; goto out_unlock;
pos = ALIGN(erofs_iloc(inode) + vi->inode_isize + vi->xattr_isize, 8); 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)) { if (IS_ERR(h)) {
err = PTR_ERR(h); err = PTR_ERR(h);
goto out_unlock; goto out_unlock;