f2fs: kill volatile write support
Jaegeuk Kim
maintainerPATCH 1/1 f2fs: kill volatile write support
There's no user, since all can use atomic writes simply. Let's kill it.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/checkpoint.c | 4 +- fs/f2fs/data.c | 5 -- fs/f2fs/debug.c | 10 +--- fs/f2fs/f2fs.h | 27 +--------- fs/f2fs/file.c | 116 ++----------------------------------------- fs/f2fs/segment.c | 3 +- fs/f2fs/verity.c | 2 +- 7 files changed, 10 insertions(+), 157 deletions(-)
fs/f2fs/checkpoint.c +1 -3
@@ -1004,9 +1004,7 @@ static void __add_dirty_inode(struct inode *inode, enum inode_type type)return ;set_inode_flag (inode, flag); -if (!f2fs_is_volatile_file (inode)) -list_add_tail (&F2FS_I (inode)->dirty_list, - &sbi->inode_list[type]); +list_add_tail (&F2FS_I (inode)->dirty_list, &sbi->inode_list[type]);stat_inc_dirty_inode (sbi, type); }
fs/f2fs/data.c +0 -5
@@ -2741,11 +2741,6 @@ int f2fs_write_single_data_page(struct page *page, int *submitted, write:if (f2fs_is_drop_cache (inode)) goto out; -/* we should not write 0'th page having journal header */ -if (f2fs_is_volatile_file (inode) && (!page->index || - (!wbc->for_reclaim && -f2fs_available_free_memory (sbi,BASE_CHECK )))) - goto redirty_out;/* Dentry/quota blocks are controlled by checkpoint */ if (S_ISDIR (inode->i_mode) ||IS_NOQUOTA (inode)) {
fs/f2fs/debug.c +2 -8
@@ -92,9 +92,7 @@ static void update_general_status(struct f2fs_sb_info *sbi) si->nquota_files = sbi->nquota_files; si->ndirty_all = sbi->ndirty_inode[DIRTY_META ]; si->aw_cnt = sbi->atomic_files; - si->vw_cnt =atomic_read (&sbi->vw_cnt); si->max_aw_cnt =atomic_read (&sbi->max_aw_cnt); - si->max_vw_cnt =atomic_read (&sbi->max_vw_cnt); si->nr_dio_read =get_pages (sbi,F2FS_DIO_READ ); si->nr_dio_write =get_pages (sbi,F2FS_DIO_WRITE ); si->nr_wb_cp_data =get_pages (sbi,F2FS_WB_CP_DATA );
@@ -511,10 +509,8 @@ static int stat_show(struct seq_file *s, void *v) si->flush_list_empty, si->nr_discarding, si->nr_discarded, si->nr_discard_cmd, si->undiscard_blks); -seq_printf (s," - atomic IO: %4d (Max. %4d), " -"volatile IO: %4d (Max. %4d)\n" , - si->aw_cnt, si->max_aw_cnt, - si->vw_cnt, si->max_vw_cnt); +seq_printf (s," - atomic IO: %4d (Max. %4d)\n" , + si->aw_cnt, si->max_aw_cnt);seq_printf (s," - compress: %4d, hit:%8d\n" , si->compress_pages, si->compress_page_hit);seq_printf (s," - nodes: %4d in %4d\n" , si->ndirty_node, si->node_pages);
@@ -615,9 +611,7 @@ int f2fs_build_stats(struct f2fs_sb_info *sbi)for (i =META_CP ; i <META_MAX ; i++)atomic_set (&sbi->meta_count[i],0 ); -atomic_set (&sbi->vw_cnt,0 );atomic_set (&sbi->max_aw_cnt,0 ); -atomic_set (&sbi->max_vw_cnt,0 );raw_spin_lock_irqsave (&f2fs_stat_lock, flags);list_add_tail (&si->stat_list, &f2fs_stat_list);
fs/f2fs/f2fs.h +2 -25
@@ -737,7 +737,6 @@ enum {FI_UPDATE_WRITE ,/* inode has in-place-update data */ FI_NEED_IPU ,/* used for ipu per file */ FI_ATOMIC_FILE ,/* indicate atomic file */ -FI_VOLATILE_FILE ,/* indicate volatile file */ FI_FIRST_BLOCK_WRITTEN ,/* indicate #0 data block was written */ FI_DROP_CACHE ,/* drop dirty page cache */ FI_DATA_EXIST, /* indicate data exists */
@@ -1747,9 +1746,7 @@ struct f2fs_sb_info {atomic_t inline_dir;/* # of inline_dentry inodes */ atomic_t compr_inode;/* # of compressed inodes */ atomic64_t compr_blocks;/* # of compressed blocks */ -atomic_t vw_cnt;/* # of volatile writes */ atomic_t max_aw_cnt;/* max # of atomic writes */ -atomic_t max_vw_cnt;/* max # of volatile writes */ unsigned int io_skip_bggc;/* skip background gc for in-flight IO */ unsigned int other_skip_bggc;/* skip background gc for other reasons */ unsigned int ndirty_inode[NR_INODE_TYPE ];/* # of dirty inodes */
@@ -3200,11 +3197,6 @@ static inline bool f2fs_is_atomic_file(struct inode *inode)return is_inode_flag_set (inode,FI_ATOMIC_FILE ); } -static inline bool f2fs_is_volatile_file (struct inode *inode) -{ -return is_inode_flag_set (inode,FI_VOLATILE_FILE ); -} -static inline bool f2fs_is_first_block_written (struct inode *inode) {return is_inode_flag_set (inode,FI_FIRST_BLOCK_WRITTEN );
@@ -3823,7 +3815,7 @@ struct f2fs_stat_info {int inline_xattr, inline_inode, inline_dir, append, update, orphans;int compr_inode;unsigned long long compr_blocks; -int aw_cnt, max_aw_cnt, vw_cnt, max_vw_cnt; +int aw_cnt, max_aw_cnt;unsigned int valid_count, valid_node_count, valid_inode_count, discard_blks;unsigned int bimodal, avg_vblocks;int util_free, util_valid, util_invalid;
@@ -3934,17 +3926,6 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi)if (cur > max) \atomic_set (&F2FS_I_SB (inode)->max_aw_cnt, cur); \ } while (0) -#define stat_inc_volatile_write (inode) \ - (atomic_inc(&F2FS_I_SB(inode)->vw_cnt)) -#define stat_dec_volatile_write (inode) \ - (atomic_dec(&F2FS_I_SB(inode)->vw_cnt)) -#define stat_update_max_volatile_write (inode) \ - do { \ - int cur = atomic_read(&F2FS_I_SB(inode)->vw_cnt); \ - int max = atomic_read(&F2FS_I_SB(inode)->max_vw_cnt); \ - if (cur > max) \ - atomic_set(&F2FS_I_SB(inode)->max_vw_cnt, cur); \ - } while (0)#define stat_inc_seg_count (sbi, type, gc_type) \ do { \ struct f2fs_stat_info *si = F2FS_STAT(sbi); \
@@ -4006,9 +3987,6 @@ void f2fs_update_sit_info(struct f2fs_sb_info *sbi);#define stat_add_compr_blocks (inode, blocks) do { } while (0)#define stat_sub_compr_blocks (inode, blocks) do { } while (0)#define stat_update_max_atomic_write (inode) do { } while (0) -#define stat_inc_volatile_write (inode) do { } while (0) -#define stat_dec_volatile_write (inode) do { } while (0) -#define stat_update_max_volatile_write (inode) do { } while (0)#define stat_inc_meta_count (sbi, blkaddr) do { } while (0)#define stat_inc_seg_type (sbi, curseg) do { } while (0)#define stat_inc_block_count (sbi, curseg) do { } while (0)
@@ -4411,8 +4389,7 @@ static inline bool f2fs_lfs_mode(struct f2fs_sb_info *sbi)static inline bool f2fs_may_compress (struct inode *inode) {if (IS_SWAPFILE (inode) ||f2fs_is_pinned_file (inode) || -f2fs_is_atomic_file (inode) || -f2fs_is_volatile_file (inode)) +f2fs_is_atomic_file (inode))return false;return S_ISREG (inode->i_mode) ||S_ISDIR (inode->i_mode); }
fs/f2fs/file.c +3 -113
150 lines not on this page · raw message
fs/f2fs/segment.c +1 -2
@@ -3173,8 +3173,7 @@ static int __get_segment_type_6(struct f2fs_io_info *fio)return CURSEG_COLD_DATA ;if (file_is_hot (inode) ||is_inode_flag_set (inode,FI_HOT_DATA ) || -f2fs_is_atomic_file (inode) || -f2fs_is_volatile_file (inode)) +f2fs_is_atomic_file (inode))return CURSEG_HOT_DATA ;return f2fs_rw_hint_to_seg_type (inode->i_write_hint); }else {
fs/f2fs/verity.c +1 -1
@@ -128,7 +128,7 @@ static int f2fs_begin_enable_verity(struct file *filp)if (f2fs_verity_in_progress (inode))return -EBUSY ; -if (f2fs_is_atomic_file (inode) ||f2fs_is_volatile_file (inode)) +if (f2fs_is_atomic_file (inode))return -EOPNOTSUPP ;/*
Signature · 1 line
2.36.0.512.ge40c2bad7a-goog