github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

f2fs: cache: use compress cache

Browse Source 
This patch migrates compressed cluster caching from the fake VFS inode
page cache (sbi->compress_inode) to compress cache (sbi->compress_blocks).

It converts compression caching and decompression paths to use
compress cache APIs, uses entry->ino for per-inode invalidation, and
removes sbi->compress_inode.

Reviewed-by: Zhiguo Niu <zhiguo.niu@unisoc.com>
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Chao Yu 2026-09-17 15:33:40 +08:00 committed by Jaegeuk Kim
parent bf452b33bd
commit 6a78d04881
9 changed files with 74 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
fs/f2fs/compress.c
View File

@ -1893,30 +1893,19 @@ unsigned int f2fs_cluster_blocks_are_contiguous(struct dnode_of_data *dn,
return compressed ? i - 1 : i; return compressed ? i - 1 : i;
} }
const struct address_space_operations f2fs_compress_aops = {
.release_folio = f2fs_release_folio,
.invalidate_folio = f2fs_invalidate_folio,
.migrate_folio = filemap_migrate_folio,
};
struct address_space *COMPRESS_MAPPING(struct f2fs_sb_info *sbi)
{
return sbi->compress_inode->i_mapping;
}
void f2fs_invalidate_compress_pages_range(struct f2fs_sb_info *sbi, void f2fs_invalidate_compress_pages_range(struct f2fs_sb_info *sbi,
block_t blkaddr, unsigned int len) block_t blkaddr, unsigned int len)
{ {
if (!sbi->compress_inode) if (!test_opt(sbi, COMPRESS_CACHE))
return; return;
invalidate_mapping_pages(COMPRESS_MAPPING(sbi), blkaddr, blkaddr + len - 1);
f2fs_drop_cache_range(COMPRESS_CACHE(sbi), blkaddr, len, false);
} }
static void f2fs_cache_compressed_page(struct f2fs_sb_info *sbi, static void f2fs_cache_compressed_page(struct f2fs_sb_info *sbi,
struct folio *folio, nid_t ino, block_t blkaddr) struct folio *folio, nid_t ino, block_t blkaddr)
{ {
struct folio *cfolio; struct f2fs_cached_block *entry;
int ret;
if (!test_opt(sbi, COMPRESS_CACHE)) if (!test_opt(sbi, COMPRESS_CACHE))
return; return;
@ -1924,52 +1913,48 @@ static void f2fs_cache_compressed_page(struct f2fs_sb_info *sbi,
if (!f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE_READ)) if (!f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE_READ))
return; return;
if (!f2fs_available_free_memory(sbi, COMPRESS_PAGE)) if (!f2fs_available_free_memory(sbi, COMPRESS_BLOCK))
return; return;
cfolio = filemap_get_folio(COMPRESS_MAPPING(sbi), blkaddr); entry = f2fs_find_cache(COMPRESS_CACHE(sbi), blkaddr,
if (!IS_ERR(cfolio)) { F2FS_CACHE_ACCESS);
f2fs_folio_put(cfolio, false); if (!IS_ERR(entry)) {
f2fs_put_cache(entry, false);
return; return;
} }
cfolio = filemap_alloc_folio(__GFP_NOWARN | __GFP_IO, 0, NULL); entry = f2fs_grab_cache(COMPRESS_CACHE(sbi), blkaddr,
if (!cfolio) F2FS_CACHE_LOCK_CREATE);
if (IS_ERR(entry))
return; return;
ret = filemap_add_folio(COMPRESS_MAPPING(sbi), cfolio, entry->ino = ino;
blkaddr, GFP_NOFS); memcpy(cache_address(entry), folio_address(folio), sbi->blocksize);
if (ret) { f2fs_cache_set_uptodate(entry);
f2fs_folio_put(cfolio, false); f2fs_put_cache(entry, true);
return;
}
folio_set_f2fs_data(cfolio, ino);
memcpy(folio_address(cfolio), folio_address(folio), PAGE_SIZE);
folio_mark_uptodate(cfolio);
f2fs_folio_put(cfolio, true);
} }
bool f2fs_load_compressed_folio(struct f2fs_sb_info *sbi, struct folio *folio, bool f2fs_load_compressed_folio(struct f2fs_sb_info *sbi, struct folio *folio,
block_t blkaddr) block_t blkaddr)
{ {
struct folio *cfolio; struct f2fs_cached_block *entry;
bool hitted = false; bool hitted = false;
if (!test_opt(sbi, COMPRESS_CACHE)) if (!test_opt(sbi, COMPRESS_CACHE))
return false; return false;
cfolio = f2fs_filemap_get_folio(COMPRESS_MAPPING(sbi), entry = f2fs_find_cache(COMPRESS_CACHE(sbi), blkaddr,
blkaddr, FGP_LOCK | FGP_NOWAIT, GFP_NOFS); F2FS_CACHE_ACCESS);
if (!IS_ERR(cfolio)) { if (!IS_ERR(entry)) {
if (folio_test_uptodate(cfolio)) { f2fs_lock_cache(entry);
if (f2fs_is_compress_cache(entry) &&
f2fs_cache_test_uptodate(entry)) {
atomic_inc(&sbi->compress_page_hit); atomic_inc(&sbi->compress_page_hit);
memcpy(folio_address(folio), memcpy(folio_address(folio),
folio_address(cfolio), folio_size(folio)); cache_address(entry), folio_size(folio));
hitted = true; hitted = true;
} }
f2fs_folio_put(cfolio, true); f2fs_put_cache(entry, true);
} }
return hitted; return hitted;
@ -1977,71 +1962,49 @@ bool f2fs_load_compressed_folio(struct f2fs_sb_info *sbi, struct folio *folio,
void f2fs_invalidate_compress_pages(struct f2fs_sb_info *sbi, nid_t ino) void f2fs_invalidate_compress_pages(struct f2fs_sb_info *sbi, nid_t ino)
{ {
struct address_space *mapping = COMPRESS_MAPPING(sbi); struct f2fs_cached_block_list *cache = COMPRESS_CACHE(sbi);
struct folio_batch fbatch; struct f2fs_cached_block *entries[F2FS_ONSTACK_CACHES];
pgoff_t index = 0; pgoff_t index = 0, end = ULONG_MAX;
pgoff_t end = MAX_BLKADDR(sbi); int nr;
int i;
if (!mapping->nrpages) if (!cache->num_entries)
return; return;
next:
nr = f2fs_cache_gang_lookup(cache, entries, &index, end);
if (!nr)
return;
for (i = 0; i < nr; i++) {
struct f2fs_cached_block *entry = entries[i];
folio_batch_init(&fbatch); index = entry->index + 1;
do { f2fs_lock_cache(entry);
unsigned int nr, i; if (unlikely(!f2fs_is_compress_cache(entry)))
goto unlock;
if (entry->ino != ino)
goto unlock;
nr = filemap_get_folios(mapping, &index, end - 1, &fbatch); f2fs_truncate_locked_cache(entry, false);
if (!nr) unlock:
break; f2fs_unlock_cache(entry);
}
f2fs_cache_gang_release(entries, nr);
for (i = 0; i < nr; i++) { if (index < end) {
struct folio *folio = fbatch.folios[i];
folio_lock(folio);
if (folio->mapping != mapping) {
folio_unlock(folio);
continue;
}
if (ino != folio_get_f2fs_data(folio)) {
folio_unlock(folio);
continue;
}
generic_error_remove_folio(mapping, folio);
folio_unlock(folio);
}
folio_batch_release(&fbatch);
cond_resched(); cond_resched();
} while (index < end); goto next;
}
} }
int f2fs_init_compress_inode(struct f2fs_sb_info *sbi) void f2fs_init_compress_cache_context(struct f2fs_sb_info *sbi)
{ {
struct inode *inode;
if (!test_opt(sbi, COMPRESS_CACHE)) if (!test_opt(sbi, COMPRESS_CACHE))
return 0; return;
inode = f2fs_iget(sbi->sb, F2FS_COMPRESS_INO(sbi));
if (IS_ERR(inode))
return PTR_ERR(inode);
sbi->compress_inode = inode;
sbi->compress_percent = COMPRESS_PERCENT; sbi->compress_percent = COMPRESS_PERCENT;
sbi->compress_watermark = COMPRESS_WATERMARK; sbi->compress_watermark = COMPRESS_WATERMARK;
atomic_set(&sbi->compress_page_hit, 0); atomic_set(&sbi->compress_page_hit, 0);
return 0;
}
void f2fs_destroy_compress_inode(struct f2fs_sb_info *sbi)
{
if (!sbi->compress_inode)
return;
iput(sbi->compress_inode);
sbi->compress_inode = NULL;
} }
int f2fs_init_page_array_cache(struct f2fs_sb_info *sbi) int f2fs_init_page_array_cache(struct f2fs_sb_info *sbi)

9
fs/f2fs/debug.c
View File

@ -225,8 +225,8 @@ static void update_general_status(struct f2fs_sb_info *sbi)
si->node_caches = NODE_CACHE(sbi)->num_entries; si->node_caches = NODE_CACHE(sbi)->num_entries;
si->meta_caches = META_CACHE(sbi)->num_entries; si->meta_caches = META_CACHE(sbi)->num_entries;
#ifdef CONFIG_F2FS_FS_COMPRESSION #ifdef CONFIG_F2FS_FS_COMPRESSION
if (sbi->compress_inode) { if (test_opt(sbi, COMPRESS_CACHE)) {
si->compress_pages = COMPRESS_MAPPING(sbi)->nrpages; si->compress_pages = COMPRESS_CACHE(sbi)->num_entries;
si->compress_page_hit = atomic_read(&sbi->compress_page_hit); si->compress_page_hit = atomic_read(&sbi->compress_page_hit);
} }
#endif #endif
@ -386,10 +386,11 @@ static void update_mem_info(struct f2fs_sb_info *sbi)
si->page_mem += (unsigned long long)NODE_CACHE(sbi)->num_entries << PAGE_SHIFT; si->page_mem += (unsigned long long)NODE_CACHE(sbi)->num_entries << PAGE_SHIFT;
si->cache_mem += NODE_CACHE(sbi)->num_entries * sizeof(struct f2fs_cached_block); si->cache_mem += NODE_CACHE(sbi)->num_entries * sizeof(struct f2fs_cached_block);
#ifdef CONFIG_F2FS_FS_COMPRESSION #ifdef CONFIG_F2FS_FS_COMPRESSION
if (sbi->compress_inode) { if (test_opt(sbi, COMPRESS_CACHE)) {
unsigned long npages = COMPRESS_MAPPING(sbi)->nrpages; unsigned long npages = COMPRESS_CACHE(sbi)->num_entries;
si->page_mem += (unsigned long long)npages << PAGE_SHIFT; si->page_mem += (unsigned long long)npages << PAGE_SHIFT;
si->cache_mem += npages * sizeof(struct f2fs_cached_block);
} }
#endif #endif
} }

8
fs/f2fs/f2fs.h
View File

@ -2077,7 +2077,6 @@ struct f2fs_sb_info {
u32 compr_new_inode; u32 compr_new_inode;
/* For compressed block cache */ /* For compressed block cache */
struct inode *compress_inode; /* cache compressed blocks */
unsigned int compress_percent; /* cache page percentage */ unsigned int compress_percent; /* cache page percentage */
unsigned int compress_watermark; /* cache page watermark */ unsigned int compress_watermark; /* cache page watermark */
atomic_t compress_page_hit; /* cache hit count */ atomic_t compress_page_hit; /* cache hit count */
@ -4889,13 +4888,11 @@ unsigned int f2fs_cluster_blocks_are_contiguous(struct dnode_of_data *dn,
int f2fs_init_compress_ctx(struct compress_ctx *cc); int f2fs_init_compress_ctx(struct compress_ctx *cc);
void f2fs_destroy_compress_ctx(struct compress_ctx *cc, bool reuse); void f2fs_destroy_compress_ctx(struct compress_ctx *cc, bool reuse);
void f2fs_init_compress_info(struct f2fs_sb_info *sbi); void f2fs_init_compress_info(struct f2fs_sb_info *sbi);
int f2fs_init_compress_inode(struct f2fs_sb_info *sbi); void f2fs_init_compress_cache_context(struct f2fs_sb_info *sbi);
void f2fs_destroy_compress_inode(struct f2fs_sb_info *sbi);
int f2fs_init_page_array_cache(struct f2fs_sb_info *sbi); int f2fs_init_page_array_cache(struct f2fs_sb_info *sbi);
void f2fs_destroy_page_array_cache(struct f2fs_sb_info *sbi); void f2fs_destroy_page_array_cache(struct f2fs_sb_info *sbi);
int __init f2fs_init_compress_cache(void); int __init f2fs_init_compress_cache(void);
void f2fs_destroy_compress_cache(void); void f2fs_destroy_compress_cache(void);
struct address_space *COMPRESS_MAPPING(struct f2fs_sb_info *sbi);
void f2fs_invalidate_compress_pages_range(struct f2fs_sb_info *sbi, void f2fs_invalidate_compress_pages_range(struct f2fs_sb_info *sbi,
block_t blkaddr, unsigned int len); block_t blkaddr, unsigned int len);
bool f2fs_load_compressed_folio(struct f2fs_sb_info *sbi, struct folio *folio, bool f2fs_load_compressed_folio(struct f2fs_sb_info *sbi, struct folio *folio,
@ -4944,8 +4941,7 @@ static inline void f2fs_put_folio_dic(struct folio *folio, bool in_task)
static inline unsigned int f2fs_cluster_blocks_are_contiguous( static inline unsigned int f2fs_cluster_blocks_are_contiguous(
struct dnode_of_data *dn, unsigned int ofs_in_node) { return 0; } struct dnode_of_data *dn, unsigned int ofs_in_node) { return 0; }
static inline bool f2fs_sanity_check_cluster(struct dnode_of_data *dn) { return false; } static inline bool f2fs_sanity_check_cluster(struct dnode_of_data *dn) { return false; }
static inline int f2fs_init_compress_inode(struct f2fs_sb_info *sbi) { return 0; } static inline void f2fs_init_compress_cache_context(struct f2fs_sb_info *sbi) { }
static inline void f2fs_destroy_compress_inode(struct f2fs_sb_info *sbi) { }
static inline int f2fs_init_page_array_cache(struct f2fs_sb_info *sbi) { return 0; } static inline int f2fs_init_page_array_cache(struct f2fs_sb_info *sbi) { return 0; }
static inline void f2fs_destroy_page_array_cache(struct f2fs_sb_info *sbi) { } static inline void f2fs_destroy_page_array_cache(struct f2fs_sb_info *sbi) { }
static inline int __init f2fs_init_compress_cache(void) { return 0; } static inline int __init f2fs_init_compress_cache(void) { return 0; }

49
fs/f2fs/inode.c
View File

@ -574,15 +574,6 @@ static int do_read_inode(struct inode *inode)
return 0; return 0;
} }
static bool is_meta_ino(struct f2fs_sb_info *sbi, unsigned int ino)
{
#ifdef CONFIG_F2FS_FS_COMPRESSION
if (test_opt(sbi, COMPRESS_CACHE) && ino == F2FS_COMPRESS_INO(sbi))
return true;
#endif
return false;
}
struct inode *f2fs_iget(struct super_block *sb, unsigned long ino) struct inode *f2fs_iget(struct super_block *sb, unsigned long ino)
{ {
struct f2fs_sb_info *sbi = F2FS_SB(sb); struct f2fs_sb_info *sbi = F2FS_SB(sb);
@ -594,42 +585,17 @@ struct inode *f2fs_iget(struct super_block *sb, unsigned long ino)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
if (!(inode_state_read_once(inode) & I_NEW)) { if (!(inode_state_read_once(inode) & I_NEW)) {
if (is_meta_ino(sbi, ino)) {
f2fs_err(sbi, "inaccessible inode: %lu, run fsck to repair", ino);
set_sbi_flag(sbi, SBI_NEED_FSCK);
ret = -EFSCORRUPTED;
trace_f2fs_iget_exit(inode, ret);
iput(inode);
f2fs_handle_error(sbi, ERROR_CORRUPTED_INODE);
fserror_report_file_metadata(inode, ret, GFP_NOFS);
return ERR_PTR(ret);
}
trace_f2fs_iget(inode); trace_f2fs_iget(inode);
return inode; return inode;
} }
if (is_meta_ino(sbi, ino))
goto make_now;
ret = do_read_inode(inode); ret = do_read_inode(inode);
if (ret) if (ret)
goto bad_inode; goto bad_inode;
make_now:
f2fs_set_inode_flags(inode); f2fs_set_inode_flags(inode);
if (ino == F2FS_COMPRESS_INO(sbi)) { if (S_ISREG(inode->i_mode)) {
#ifdef CONFIG_F2FS_FS_COMPRESSION
inode->i_mapping->a_ops = &f2fs_compress_aops;
/*
* generic_error_remove_folio only truncates pages of regular
* inode
*/
inode->i_mode |= S_IFREG;
#endif
mapping_set_gfp_mask(inode->i_mapping,
GFP_NOFS | __GFP_HIGHMEM | __GFP_MOVABLE);
} else if (S_ISREG(inode->i_mode)) {
inode->i_op = &f2fs_file_inode_operations; inode->i_op = &f2fs_file_inode_operations;
inode->i_fop = &f2fs_file_operations; inode->i_fop = &f2fs_file_operations;
inode->i_mapping->a_ops = &f2fs_dblock_aops; inode->i_mapping->a_ops = &f2fs_dblock_aops;
@ -882,7 +848,7 @@ static void f2fs_evict_inode_work(struct work_struct *work)
/* /*
* Return true, if we shouldn't go through post_evict_inode. * Return true, if we shouldn't go through post_evict_inode.
*/ */
static bool f2fs_pre_evict_inode(struct inode *inode) static void f2fs_pre_evict_inode(struct inode *inode)
{ {
struct f2fs_sb_info *sbi = F2FS_I_SB(inode); struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
struct f2fs_inode_info *fi = F2FS_I(inode); struct f2fs_inode_info *fi = F2FS_I(inode);
@ -908,17 +874,12 @@ static bool f2fs_pre_evict_inode(struct inode *inode)
test_opt(sbi, COMPRESS_CACHE) && f2fs_compressed_file(inode)) test_opt(sbi, COMPRESS_CACHE) && f2fs_compressed_file(inode))
f2fs_invalidate_compress_pages(sbi, inode->i_ino); f2fs_invalidate_compress_pages(sbi, inode->i_ino);
if (inode->i_ino == F2FS_COMPRESS_INO(sbi))
return true;
f2fs_bug_on(sbi, get_dirty_pages(inode)); f2fs_bug_on(sbi, get_dirty_pages(inode));
f2fs_remove_dirty_inode(inode); f2fs_remove_dirty_inode(inode);
f2fs_remove_donate_inode(inode); f2fs_remove_donate_inode(inode);
if (!IS_DEVICE_ALIASING(inode)) if (!IS_DEVICE_ALIASING(inode))
f2fs_destroy_extent_tree(inode); f2fs_destroy_extent_tree(inode);
return false;
} }
static void f2fs_delete_inode(struct inode *inode) static void f2fs_delete_inode(struct inode *inode)
@ -1080,15 +1041,13 @@ static void f2fs_post_evict_inode(struct inode *inode)
*/ */
void f2fs_evict_inode(struct inode *inode) void f2fs_evict_inode(struct inode *inode)
{ {
if (f2fs_pre_evict_inode(inode)) f2fs_pre_evict_inode(inode);
goto clear_out;
if (!inode->i_nlink && !is_bad_inode(inode)) if (!inode->i_nlink && !is_bad_inode(inode))
f2fs_delete_inode(inode); f2fs_delete_inode(inode);
f2fs_post_evict_inode(inode); f2fs_post_evict_inode(inode);
clear_out:
fscrypt_put_encryption_info(inode); fscrypt_put_encryption_info(inode);
clear_inode(inode); clear_inode(inode);
} }

4
fs/f2fs/node.c
View File

@ -109,7 +109,7 @@ bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type)
mem_size = (atomic_read(&dcc->discard_cmd_cnt) * mem_size = (atomic_read(&dcc->discard_cmd_cnt) *
sizeof(struct discard_cmd)) >> PAGE_SHIFT; sizeof(struct discard_cmd)) >> PAGE_SHIFT;
res = mem_size < (avail_ram * nm_i->ram_thresh / 100); res = mem_size < (avail_ram * nm_i->ram_thresh / 100);
} else if (type == COMPRESS_PAGE) { } else if (type == COMPRESS_BLOCK) {
#ifdef CONFIG_F2FS_FS_COMPRESSION #ifdef CONFIG_F2FS_FS_COMPRESSION
unsigned long free_ram = val.freeram; unsigned long free_ram = val.freeram;
@ -118,7 +118,7 @@ bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type)
* exceed threshold, deny caching compress page. * exceed threshold, deny caching compress page.
*/ */
res = (free_ram > avail_ram * sbi->compress_watermark / 100) && res = (free_ram > avail_ram * sbi->compress_watermark / 100) &&
(COMPRESS_MAPPING(sbi)->nrpages < (COMPRESS_CACHE(sbi)->num_entries <
free_ram * sbi->compress_percent / 100); free_ram * sbi->compress_percent / 100);
#else #else
res = false; res = false;

2
fs/f2fs/node.h
View File

@ -157,7 +157,7 @@ enum mem_type {
READ_EXTENT_CACHE, /* indicates read extent cache */ READ_EXTENT_CACHE, /* indicates read extent cache */
AGE_EXTENT_CACHE, /* indicates age extent cache */ AGE_EXTENT_CACHE, /* indicates age extent cache */
DISCARD_CACHE, /* indicates memory of cached discard cmds */ DISCARD_CACHE, /* indicates memory of cached discard cmds */
COMPRESS_PAGE, /* indicates memory of cached compressed pages */ COMPRESS_BLOCK, /* indicates memory of cached compressed blocks */
BASE_CHECK, /* check kernel status */ BASE_CHECK, /* check kernel status */
}; };

3
fs/f2fs/shrinker.c
View File

@ -40,7 +40,8 @@ static unsigned long __count_extent_cache(struct f2fs_sb_info *sbi,
static unsigned long __count_cache(struct f2fs_sb_info *sbi) static unsigned long __count_cache(struct f2fs_sb_info *sbi)
{ {
return META_CACHE(sbi)->num_entries + return META_CACHE(sbi)->num_entries +
NODE_CACHE(sbi)->num_entries; NODE_CACHE(sbi)->num_entries +
COMPRESS_CACHE(sbi)->num_entries;
} }
unsigned long f2fs_shrink_count(struct shrinker *shrink, unsigned long f2fs_shrink_count(struct shrinker *shrink,

15
fs/f2fs/super.c
View File

@ -2069,8 +2069,6 @@ static void f2fs_put_super(struct super_block *sb)
f2fs_bug_on(sbi, sbi->fsync_node_num); f2fs_bug_on(sbi, sbi->fsync_node_num);
f2fs_destroy_compress_inode(sbi);
f2fs_destroy_cache(COMPRESS_CACHE(sbi)); f2fs_destroy_cache(COMPRESS_CACHE(sbi));
f2fs_destroy_cache(NODE_CACHE(sbi)); f2fs_destroy_cache(NODE_CACHE(sbi));
f2fs_destroy_cache(META_CACHE(sbi)); f2fs_destroy_cache(META_CACHE(sbi));
@ -5315,6 +5313,8 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc)
f2fs_init_fsync_node_info(sbi); f2fs_init_fsync_node_info(sbi);
f2fs_init_compress_cache_context(sbi);
/* setup checkpoint request control and start checkpoint issue thread */ /* setup checkpoint request control and start checkpoint issue thread */
f2fs_init_ckpt_req_control(sbi); f2fs_init_ckpt_req_control(sbi);
if (!f2fs_readonly(sb) && !test_opt(sbi, DISABLE_CHECKPOINT) && if (!f2fs_readonly(sb) && !test_opt(sbi, DISABLE_CHECKPOINT) &&
@ -5387,13 +5387,9 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc)
goto free_ino_entry; goto free_ino_entry;
} }
err = f2fs_init_compress_inode(sbi);
if (err)
goto free_root_inode;
err = f2fs_register_sysfs(sbi); err = f2fs_register_sysfs(sbi);
if (err) if (err)
goto free_compress_inode; goto free_root_inode;
sbi->umount_lock_holder = current; sbi->umount_lock_holder = current;
#ifdef CONFIG_QUOTA #ifdef CONFIG_QUOTA
@ -5561,8 +5557,6 @@ static int f2fs_fill_super(struct super_block *sb, struct fs_context *fc)
/* evict some inodes being cached by GC */ /* evict some inodes being cached by GC */
evict_inodes(sb); evict_inodes(sb);
f2fs_unregister_sysfs(sbi); f2fs_unregister_sysfs(sbi);
free_compress_inode:
f2fs_destroy_compress_inode(sbi);
free_root_inode: free_root_inode:
dput(sb->s_root); dput(sb->s_root);
sb->s_root = NULL; sb->s_root = NULL;
@ -5676,7 +5670,8 @@ static void kill_f2fs_super(struct super_block *sb)
* compress inode cache. * compress inode cache.
*/ */
if (test_opt(sbi, COMPRESS_CACHE)) if (test_opt(sbi, COMPRESS_CACHE))
truncate_inode_pages_final(COMPRESS_MAPPING(sbi)); f2fs_invalidate_compress_pages_range(sbi,
0, UINT_MAX);
#endif #endif
if (is_sbi_flag_set(sbi, SBI_IS_DIRTY) || if (is_sbi_flag_set(sbi, SBI_IS_DIRTY) ||

1
include/linux/f2fs_fs.h
View File

@ -43,7 +43,6 @@
#define F2FS_RESERVED_NODE_NUM 3 #define F2FS_RESERVED_NODE_NUM 3
#define F2FS_ROOT_INO(sbi) ((sbi)->root_ino_num) #define F2FS_ROOT_INO(sbi) ((sbi)->root_ino_num)
#define F2FS_COMPRESS_INO(sbi) (NM_I(sbi)->max_nid)
#define F2FS_MAX_QUOTAS 3 #define F2FS_MAX_QUOTAS 3