Skip to content

Commit eb2c5e4

Browse files
committed
erofs: keep meta inode into erofs_buf
So that erofs_read_metadata() can read metadata from other inodes (e.g. packed inode) as well. Signed-off-by: Jingbo Xu <jefflexu@linux.alibaba.com> Acked-by: Chao Yu <chao@kernel.org> Link: https://lore.kernel.org/r/20230407141710.113882-2-jefflexu@linux.alibaba.com Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
1 parent cb9bce7 commit eb2c5e4

6 files changed

Lines changed: 28 additions & 18 deletions

File tree

fs/erofs/data.c

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ void erofs_put_metabuf(struct erofs_buf *buf)
3131
* Derive the block size from inode->i_blkbits to make compatible with
3232
* anonymous inode in fscache mode.
3333
*/
34-
void *erofs_bread(struct erofs_buf *buf, struct inode *inode,
35-
erofs_blk_t blkaddr, enum erofs_kmap_type type)
34+
void *erofs_bread(struct erofs_buf *buf, erofs_blk_t blkaddr,
35+
enum erofs_kmap_type type)
3636
{
37+
struct inode *inode = buf->inode;
3738
erofs_off_t offset = (erofs_off_t)blkaddr << inode->i_blkbits;
38-
struct address_space *const mapping = inode->i_mapping;
3939
pgoff_t index = offset >> PAGE_SHIFT;
4040
struct page *page = buf->page;
4141
struct folio *folio;
@@ -45,7 +45,7 @@ void *erofs_bread(struct erofs_buf *buf, struct inode *inode,
4545
erofs_put_metabuf(buf);
4646

4747
nofs_flag = memalloc_nofs_save();
48-
folio = read_cache_folio(mapping, index, NULL, NULL);
48+
folio = read_cache_folio(inode->i_mapping, index, NULL, NULL);
4949
memalloc_nofs_restore(nofs_flag);
5050
if (IS_ERR(folio))
5151
return folio;
@@ -67,14 +67,19 @@ void *erofs_bread(struct erofs_buf *buf, struct inode *inode,
6767
return buf->base + (offset & ~PAGE_MASK);
6868
}
6969

70-
void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb,
71-
erofs_blk_t blkaddr, enum erofs_kmap_type type)
70+
void erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb)
7271
{
7372
if (erofs_is_fscache_mode(sb))
74-
return erofs_bread(buf, EROFS_SB(sb)->s_fscache->inode,
75-
blkaddr, type);
73+
buf->inode = EROFS_SB(sb)->s_fscache->inode;
74+
else
75+
buf->inode = sb->s_bdev->bd_inode;
76+
}
7677

77-
return erofs_bread(buf, sb->s_bdev->bd_inode, blkaddr, type);
78+
void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb,
79+
erofs_blk_t blkaddr, enum erofs_kmap_type type)
80+
{
81+
erofs_init_metabuf(buf, sb);
82+
return erofs_bread(buf, blkaddr, type);
7883
}
7984

8085
static int erofs_map_blocks_flatmode(struct inode *inode,

fs/erofs/dir.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,12 @@ static int erofs_readdir(struct file *f, struct dir_context *ctx)
5858
int err = 0;
5959
bool initial = true;
6060

61+
buf.inode = dir;
6162
while (ctx->pos < dirsize) {
6263
struct erofs_dirent *de;
6364
unsigned int nameoff, maxsize;
6465

65-
de = erofs_bread(&buf, dir, i, EROFS_KMAP);
66+
de = erofs_bread(&buf, i, EROFS_KMAP);
6667
if (IS_ERR(de)) {
6768
erofs_err(sb, "fail to readdir of logical block %u of nid %llu",
6869
i, EROFS_I(dir)->nid);

fs/erofs/internal.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ enum erofs_kmap_type {
248248
};
249249

250250
struct erofs_buf {
251+
struct inode *inode;
251252
struct page *page;
252253
void *base;
253254
enum erofs_kmap_type kmap_type;
@@ -441,8 +442,9 @@ extern const struct iomap_ops z_erofs_iomap_report_ops;
441442

442443
void erofs_unmap_metabuf(struct erofs_buf *buf);
443444
void erofs_put_metabuf(struct erofs_buf *buf);
444-
void *erofs_bread(struct erofs_buf *buf, struct inode *inode,
445-
erofs_blk_t blkaddr, enum erofs_kmap_type type);
445+
void *erofs_bread(struct erofs_buf *buf, erofs_blk_t blkaddr,
446+
enum erofs_kmap_type type);
447+
void erofs_init_metabuf(struct erofs_buf *buf, struct super_block *sb);
446448
void *erofs_read_metabuf(struct erofs_buf *buf, struct super_block *sb,
447449
erofs_blk_t blkaddr, enum erofs_kmap_type type);
448450
int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *dev);

fs/erofs/namei.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ static void *erofs_find_target_block(struct erofs_buf *target,
9999
struct erofs_buf buf = __EROFS_BUF_INITIALIZER;
100100
struct erofs_dirent *de;
101101

102-
de = erofs_bread(&buf, dir, mid, EROFS_KMAP);
102+
buf.inode = dir;
103+
de = erofs_bread(&buf, mid, EROFS_KMAP);
103104
if (!IS_ERR(de)) {
104105
const int nameoff = nameoff_from_disk(de->nameoff, bsz);
105106
const int ndirents = nameoff / sizeof(*de);
@@ -170,6 +171,7 @@ int erofs_namei(struct inode *dir, const struct qstr *name, erofs_nid_t *nid,
170171

171172
qn.name = name->name;
172173
qn.end = name->name + name->len;
174+
buf.inode = dir;
173175

174176
ndirents = 0;
175177
de = erofs_find_target_block(&buf, dir, &qn, &ndirents);

fs/erofs/super.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ static void *erofs_read_metadata(struct super_block *sb, struct erofs_buf *buf,
135135
int len, i, cnt;
136136

137137
*offset = round_up(*offset, 4);
138-
ptr = erofs_read_metabuf(buf, sb, erofs_blknr(sb, *offset), EROFS_KMAP);
138+
ptr = erofs_bread(buf, erofs_blknr(sb, *offset), EROFS_KMAP);
139139
if (IS_ERR(ptr))
140140
return ptr;
141141

@@ -151,8 +151,7 @@ static void *erofs_read_metadata(struct super_block *sb, struct erofs_buf *buf,
151151
for (i = 0; i < len; i += cnt) {
152152
cnt = min_t(int, sb->s_blocksize - erofs_blkoff(sb, *offset),
153153
len - i);
154-
ptr = erofs_read_metabuf(buf, sb, erofs_blknr(sb, *offset),
155-
EROFS_KMAP);
154+
ptr = erofs_bread(buf, erofs_blknr(sb, *offset), EROFS_KMAP);
156155
if (IS_ERR(ptr)) {
157156
kfree(buffer);
158157
return ptr;
@@ -179,6 +178,7 @@ static int erofs_load_compr_cfgs(struct super_block *sb,
179178
return -EINVAL;
180179
}
181180

181+
erofs_init_metabuf(&buf, sb);
182182
offset = EROFS_SUPER_OFFSET + sbi->sb_size;
183183
alg = 0;
184184
for (algs = sbi->available_compr_algs; algs; algs >>= 1, ++alg) {

fs/erofs/zdata.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -939,12 +939,12 @@ static int z_erofs_read_fragment(struct inode *inode, erofs_off_t pos,
939939
if (!packed_inode)
940940
return -EFSCORRUPTED;
941941

942+
buf.inode = packed_inode;
942943
pos += EROFS_I(inode)->z_fragmentoff;
943944
for (i = 0; i < len; i += cnt) {
944945
cnt = min_t(unsigned int, len - i,
945946
sb->s_blocksize - erofs_blkoff(sb, pos));
946-
src = erofs_bread(&buf, packed_inode,
947-
erofs_blknr(sb, pos), EROFS_KMAP);
947+
src = erofs_bread(&buf, erofs_blknr(sb, pos), EROFS_KMAP);
948948
if (IS_ERR(src)) {
949949
erofs_put_metabuf(&buf);
950950
return PTR_ERR(src);

0 commit comments

Comments
 (0)