github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-23 06:31:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

exfat: support reuse buffer head for exfat_ent_get

Browse Source 
This patch is part 2 of cached buffer head for exfat_ent_get,
it introduces an argument for exfat_ent_get, and make sure this
routine releases buffer head refcount when any error return.

Signed-off-by: Chi Zhiling <chizhiling@kylinos.cn>
Reviewed-by: Yuezhang Mo <Yuezhang.Mo@sony.com>
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
This commit is contained in:
Chi Zhiling 2026-01-14 20:12:38 +08:00 committed by Namjae Jeon
parent 967288e9a6
commit 5cf0288f0d
3 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/exfat/cache.c
View File

@ -287,7 +287,7 @@ int exfat_get_cluster(struct inode *inode, unsigned int cluster,
return -EIO;
}
if (exfat_ent_get(sb, *dclus, &content))
if (exfat_ent_get(sb, *dclus, &content, NULL))
return -EIO;
*last_dclus = *dclus;

4
fs/exfat/exfat_fs.h
View File

@ -432,13 +432,13 @@ int exfat_set_volume_dirty(struct super_block *sb);
int exfat_clear_volume_dirty(struct super_block *sb);
/* fatent.c */
#define exfat_get_next_cluster(sb, pclu) exfat_ent_get(sb, *(pclu), pclu)
#define exfat_get_next_cluster(sb, pclu) exfat_ent_get(sb, *(pclu), pclu, NULL)
int exfat_alloc_cluster(struct inode *inode, unsigned int num_alloc,
struct exfat_chain *p_chain, bool sync_bmap);
int exfat_free_cluster(struct inode *inode, struct exfat_chain *p_chain);
int exfat_ent_get(struct super_block *sb, unsigned int loc,
unsigned int *content);
unsigned int *content, struct buffer_head **last);
int exfat_ent_set(struct super_block *sb, unsigned int loc,
unsigned int content);
int exfat_chain_cont_cluster(struct super_block *sb, unsigned int chain,

39
fs/exfat/fatent.c
View File

@ -88,49 +88,58 @@ int exfat_ent_set(struct super_block *sb, unsigned int loc,
return 0;
}
/*
* Caller must release the buffer_head if no error return.
*/
int exfat_ent_get(struct super_block *sb, unsigned int loc,
unsigned int *content)
unsigned int *content, struct buffer_head **last)
{
struct exfat_sb_info *sbi = EXFAT_SB(sb);
int err;
if (!is_valid_cluster(sbi, loc)) {
exfat_fs_error_ratelimit(sb,
"invalid access to FAT (entry 0x%08x)",
loc);
return -EIO;
goto err;
}
err = __exfat_ent_get(sb, loc, content, NULL);
if (err) {
if (unlikely(__exfat_ent_get(sb, loc, content, last))) {
exfat_fs_error_ratelimit(sb,
"failed to access to FAT (entry 0x%08x, err:%d)",
loc, err);
return err;
"failed to access to FAT (entry 0x%08x)",
loc);
goto err;
}
if (*content == EXFAT_FREE_CLUSTER) {
if (unlikely(*content == EXFAT_FREE_CLUSTER)) {
exfat_fs_error_ratelimit(sb,
"invalid access to FAT free cluster (entry 0x%08x)",
loc);
return -EIO;
goto err;
}
if (*content == EXFAT_BAD_CLUSTER) {
if (unlikely(*content == EXFAT_BAD_CLUSTER)) {
exfat_fs_error_ratelimit(sb,
"invalid access to FAT bad cluster (entry 0x%08x)",
loc);
return -EIO;
goto err;
}
if (*content != EXFAT_EOF_CLUSTER && !is_valid_cluster(sbi, *content)) {
exfat_fs_error_ratelimit(sb,
"invalid access to FAT (entry 0x%08x) bogus content (0x%08x)",
loc, *content);
return -EIO;
goto err;
}
return 0;
err:
if (last) {
brelse(*last);
/* Avoid double release */
*last = NULL;
}
return -EIO;
}
int exfat_chain_cont_cluster(struct super_block *sb, unsigned int chain,
@ -299,7 +308,7 @@ int exfat_find_last_cluster(struct super_block *sb, struct exfat_chain *p_chain,
do {
count++;
clu = next;
if (exfat_ent_get(sb, clu, &next))
if (exfat_ent_get(sb, clu, &next, NULL))
return -EIO;
} while (next != EXFAT_EOF_CLUSTER && count <= p_chain->size);
@ -490,7 +499,7 @@ int exfat_count_num_clusters(struct super_block *sb,
count = 0;
for (i = EXFAT_FIRST_CLUSTER; i < sbi->num_clusters; i++) {
count++;
if (exfat_ent_get(sb, clu, &clu))
if (exfat_ent_get(sb, clu, &clu, NULL))
return -EIO;
if (clu == EXFAT_EOF_CLUSTER)
break;