f2fs: change the current atomic write way
PATCH 1/1 f2fs: change the current atomic write way
From: Daeho Jeong <[email protected]>
Current atomic write has three major issues like below.
- keeps the updates in non-reclaimable memory space and they are even hard to be migrated, which is not good for contiguous memory allocation.
- disk spaces used for atomic files cannot be garbage collected, so this makes it difficult for the filesystem to be defragmented.
- If atomic write operations hit the threshold of either memory usage or garbage collection failure count, All the atomic write operations will fail immediately.
To resolve the issues, I will keep a COW inode internally for all the updates to be flushed from memory, when we need to flush them out in a situation like high memory pressure. These COW inodes will be tagged as orphan inodes to be reclaimed in case of sudden power-cut or system failure during atomic writes.
--- fs/f2fs/data.c | 176 ++++++++++++++-------- fs/f2fs/debug.c | 12 +- fs/f2fs/f2fs.h | 27 +--- fs/f2fs/file.c | 48 +++--- fs/f2fs/gc.c | 27 +--- fs/f2fs/inode.c | 3 +- fs/f2fs/namei.c | 28 ++-- fs/f2fs/node.c | 4 - fs/f2fs/node.h | 1 - fs/f2fs/segment.c | 374 ++++++++++++++++------------------------------ fs/f2fs/segment.h | 4 +- fs/f2fs/super.c | 6 +- 12 files changed, 298 insertions(+), 412 deletions(-)
fs/f2fs/data.c +115 -61
@@ -69,8 +69,7 @@ static bool __is_cp_guaranteed(struct page *page)if (f2fs_is_compressed_page (page))return false; -if ((S_ISREG (inode->i_mode) && - (f2fs_is_atomic_file (inode) ||IS_NOQUOTA (inode))) || +if ((S_ISREG (inode->i_mode) &&IS_NOQUOTA (inode)) ||page_private_gcing (page))return true;return false;
@@ -2556,7 +2555,12 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio)bool ipu_force = false;int err =0 ; -set_new_dnode (&dn, inode,NULL ,NULL ,0 ); +/* Use COW inode to make dnode_of_data for atomic write */ +if (f2fs_is_atomic_file (inode)) +set_new_dnode (&dn,F2FS_I (inode)->cow_inode,NULL ,NULL ,0 ); +else +set_new_dnode (&dn, inode,NULL ,NULL ,0 ); +if (need_inplace_update (fio) &&f2fs_lookup_extent_cache (inode, page->index, &ei)) { fio->old_blkaddr = ei.blk + page->index - ei.fofs;
@@ -2593,6 +2597,7 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) err = -EFSCORRUPTED ; goto out_writepage; } +/* * If current allocation needs SSR, * it had better in-place writes for updated data.
@@ -3307,6 +3312,100 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi,return err; } +static int __find_data_block (struct inode *inode,pgoff_t index, +block_t *blk_addr) +{ +struct dnode_of_data dn; +struct page *ipage; +struct extent_info ei = {0 , }; +int err =0 ; + + ipage =f2fs_get_node_page (F2FS_I_SB (inode), inode->i_ino); +if (IS_ERR (ipage)) +return PTR_ERR (ipage); + +set_new_dnode (&dn, inode, ipage, ipage,0 ); + +if (f2fs_lookup_extent_cache (inode, index, &ei)) { + dn.data_blkaddr = ei.blk + index - ei.fofs; + }else { +/* hole case */ + err =f2fs_get_dnode_of_data (&dn, index,LOOKUP_NODE ); +if (err) { + dn.data_blkaddr =NULL_ADDR ; + err =0 ; + } + } + *blk_addr = dn.data_blkaddr; +f2fs_put_dnode (&dn); +return err; +} + +static int __reserve_data_block (struct inode *inode,pgoff_t index, +block_t *blk_addr,bool *node_changed) +{ +struct f2fs_sb_info *sbi =F2FS_I_SB (inode); +struct dnode_of_data dn; +struct page *ipage; +int err =0 ; + +f2fs_do_map_lock (sbi,F2FS_GET_BLOCK_PRE_AIO , true); + + ipage =f2fs_get_node_page (sbi, inode->i_ino); +if (IS_ERR (ipage)) { + err =PTR_ERR (ipage); + goto unlock_out; + } +set_new_dnode (&dn, inode, ipage, ipage,0 ); + + err =f2fs_get_block (&dn, index); + + *blk_addr = dn.data_blkaddr; + *node_changed = dn.node_changed; +f2fs_put_dnode (&dn); + +unlock_out: +f2fs_do_map_lock (sbi,F2FS_GET_BLOCK_PRE_AIO , false); +return err; +} + +static int prepare_atomic_write_begin (struct f2fs_sb_info *sbi, +struct page *page,loff_t pos,unsigned int len, +block_t *blk_addr,bool *node_changed) +{ +struct inode *inode = page->mapping->host; +struct inode *cow_inode =F2FS_I (inode)->cow_inode; +pgoff_t index = page->index; +int err =0 ; +block_t ori_blk_addr; + +/* If pos is beyond the end of file, reserve a new block in COW inode */ +if ((pos &PAGE_MASK ) >=i_size_read (inode)) +return __reserve_data_block (cow_inode, index, blk_addr, + node_changed); + +/* Look for the block in COW inode first */ + err =__find_data_block (cow_inode, index, blk_addr); +if (err) +return err; +else if (*blk_addr !=NULL_ADDR ) +return 0 ; + +/* Look for the block in the original inode */ + err =__find_data_block (inode, index, &ori_blk_addr); +if (err) +return err; + +/* Finally, we should reserve a new block in COW inode for the update */ + err =__reserve_data_block (cow_inode, index, blk_addr, node_changed); +if (err) +return err; + +if (ori_blk_addr !=NULL_ADDR ) + *blk_addr = ori_blk_addr; +return 0 ; +} +static int f2fs_write_begin (struct file *file,struct address_space *mapping,loff_t pos,unsigned len,unsigned flags,struct page **pagep,void **fsdata)
@@ -3315,7 +3414,7 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct page *page =NULL ;pgoff_t index = ((unsigned long long ) pos) >>PAGE_SHIFT ; -bool need_balance = false, drop_atomic = false; +bool need_balance = false;block_t blkaddr =NULL_ADDR ;int err =0 ;
@@ -3326,14 +3425,6 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, goto fail; } -if ((f2fs_is_atomic_file (inode) && - !f2fs_available_free_memory (sbi,INMEM_PAGES )) || -is_inode_flag_set (inode,FI_ATOMIC_REVOKE_REQUEST )) { - err = -ENOMEM ; - drop_atomic = true; - goto fail; - } -/* * We should check this at this moment to avoid deadlock on inode page * and #0 page. The locking rule for inline_data conversion should be:
@@ -3381,7 +3472,11 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, *pagep = page; - err =prepare_write_begin (sbi, page, pos, len, +if (f2fs_is_atomic_file (inode)) + err =prepare_atomic_write_begin (sbi, page, pos, len, + &blkaddr, &need_balance); +else + err =prepare_write_begin (sbi, page, pos, len, &blkaddr, &need_balance);if (err) goto fail;
@@ -3437,8 +3532,6 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, fail:f2fs_put_page (page,1 );f2fs_write_failed (inode, pos + len); -if (drop_atomic) -f2fs_drop_inmem_pages_all (sbi, false);return err; }
@@ -3482,8 +3575,12 @@ static int f2fs_write_end(struct file *file,set_page_dirty (page);if (pos + copied >i_size_read (inode) && - !f2fs_verity_in_progress (inode)) + !f2fs_verity_in_progress (inode)) {f2fs_i_size_write (inode, pos + copied); +if (f2fs_is_atomic_file (inode)) +f2fs_i_size_write (F2FS_I (inode)->cow_inode, + pos + copied); + } unlock_out:f2fs_put_page (page,1 );f2fs_update_time (F2FS_I_SB (inode),REQ_TIME );
@@ -3517,9 +3614,6 @@ void f2fs_invalidate_page(struct page *page, unsigned int offset, inode->i_ino == F2FS_COMPRESS_INO(sbi))clear_page_private_data (page); -if (page_private_atomic (page)) -return f2fs_drop_inmem_page (inode, page); -detach_page_private (page);set_page_private (page,0 ); }
@@ -3559,18 +3653,6 @@ static int f2fs_set_data_page_dirty(struct page *page)if (PageSwapCache (page))return __set_page_dirty_nobuffers (page); -if (f2fs_is_atomic_file (inode) && !f2fs_is_commit_atomic_write (inode)) { -if (!page_private_atomic (page)) { -f2fs_register_inmem_page (inode, page); -return 1 ; - } -/* -* Previously, this page has been registered, we just -* return here. -*/ -return 0 ; - } -if (!PageDirty (page)) {__set_page_dirty_nobuffers (page);f2fs_update_dirty_page (inode, page);
@@ -3650,42 +3732,14 @@ static sector_t f2fs_bmap(struct address_space *mapping, sector_t block)int f2fs_migrate_page (struct address_space *mapping,struct page *newpage,struct page *page,enum migrate_mode mode) { -int rc, extra_count; -struct f2fs_inode_info *fi =F2FS_I (mapping->host); -bool atomic_written =page_private_atomic (page); +int rc, extra_count =0 ;BUG_ON (PageWriteback (page)); -/* migrating an atomic written page is safe with the inmem_lock hold */ -if (atomic_written) { -if (mode !=MIGRATE_SYNC ) -return -EBUSY ; -if (!mutex_trylock (&fi->inmem_lock)) -return -EAGAIN ; - } - -/* one extra reference was held for atomic_write page */ - extra_count = atomic_written ?1 :0 ; rc =migrate_page_move_mapping (mapping, newpage, page, extra_count); -if (rc !=MIGRATEPAGE_SUCCESS ) { -if (atomic_written) -mutex_unlock (&fi->inmem_lock); +if (rc !=MIGRATEPAGE_SUCCESS )return rc; - } - -if (atomic_written) { -struct inmem_pages *cur; - -list_for_each_entry (cur, &fi->inmem_pages, list) -if (cur->page == page) { - cur->page = newpage; -break ; - } -mutex_unlock (&fi->inmem_lock); -put_page (page); -get_page (newpage); - }/* guarantee to start from no stale private field */ set_page_private (newpage,0 );
fs/f2fs/debug.c +2 -10
@@ -91,7 +91,6 @@ static void update_general_status(struct f2fs_sb_info *sbi) si->ndirty_files = sbi->ndirty_inode[FILE_INODE ]; si->nquota_files = sbi->nquota_files; si->ndirty_all = sbi->ndirty_inode[DIRTY_META ]; - si->inmem_pages =get_pages (sbi,F2FS_INMEM_PAGES ); si->aw_cnt = sbi->atomic_files; si->vw_cnt =atomic_read (&sbi->vw_cnt); si->max_aw_cnt =atomic_read (&sbi->max_aw_cnt);
@@ -167,8 +166,6 @@ static void update_general_status(struct f2fs_sb_info *sbi) si->alloc_nids =NM_I (sbi)->nid_cnt[PREALLOC_NID ]; si->io_skip_bggc = sbi->io_skip_bggc; si->other_skip_bggc = sbi->other_skip_bggc; - si->skipped_atomic_files[BG_GC ] = sbi->skipped_atomic_files[BG_GC ]; - si->skipped_atomic_files[FG_GC ] = sbi->skipped_atomic_files[FG_GC ]; si->util_free = (int )(free_user_blocks (sbi) >> sbi->log_blocks_per_seg) *100 / (int )(sbi->user_block_count >> sbi->log_blocks_per_seg) /2 ;
@@ -296,7 +293,6 @@ static void update_mem_info(struct f2fs_sb_info *sbi)sizeof (struct nat_entry ); si->cache_mem +=NM_I (sbi)->nat_cnt[DIRTY_NAT ] *sizeof (struct nat_entry_set ); - si->cache_mem += si->inmem_pages *sizeof (struct inmem_pages );for (i =0 ; i <MAX_INO_ENTRY ; i++) si->cache_mem += sbi->im[i].ino_num *sizeof (struct ino_entry ); si->cache_mem += atomic_read(&sbi->total_ext_tree) *
@@ -491,10 +487,6 @@ static int stat_show(struct seq_file *s, void *v) si->bg_data_blks);seq_printf (s," - node blocks : %d (%d)\n" , si->node_blks, si->bg_node_blks); -seq_printf (s,"Skipped : atomic write %llu (%llu)\n" , - si->skipped_atomic_files[BG_GC ] + - si->skipped_atomic_files[FG_GC ], - si->skipped_atomic_files[BG_GC ]);seq_printf (s,"BG skip : IO: %u, Other: %u\n" , si->io_skip_bggc, si->other_skip_bggc);seq_puts (s,"\nExtent Cache:\n" );
@@ -519,9 +511,9 @@ 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," - inmem: %4d, atomic IO: %4d (Max. %4d), " +seq_printf (s," - atomic IO: %4d (Max. %4d), " "volatile IO: %4d (Max. %4d)\n" , - si->inmem_pages, si->aw_cnt, si->max_aw_cnt, + si->aw_cnt, si->max_aw_cnt, si->vw_cnt, si->max_vw_cnt);seq_printf (s," - compress: %4d, hit:%8d\n" , si->compress_pages, si->compress_page_hit); seq_printf(s, " - nodes: %4d in %4d\n",
fs/f2fs/f2fs.h +6 -21
@@ -717,7 +717,6 @@ enum {enum {GC_FAILURE_PIN , -GC_FAILURE_ATOMIC ,MAX_GC_FAILURE };
@@ -739,7 +738,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_ATOMIC_COMMIT ,/* indicate the state of atomical committing */ FI_VOLATILE_FILE ,/* indicate volatile file */ FI_FIRST_BLOCK_WRITTEN ,/* indicate #0 data block was written */ FI_DROP_CACHE, /* drop dirty page cache */
@@ -753,7 +751,6 @@ enum {FI_EXTRA_ATTR ,/* indicate file has extra attribute */ FI_PROJ_INHERIT ,/* indicate file inherits projectid */ FI_PIN_FILE ,/* indicate file should not be gced */ -FI_ATOMIC_REVOKE_REQUEST ,/* request to drop atomic data */ FI_VERITY_IN_PROGRESS ,/* building fs-verity Merkle tree */ FI_COMPRESSED_FILE ,/* indicate file's data can be compressed */ FI_COMPRESS_CORRUPT, /* indicate compressed cluster is corrupted */
@@ -795,11 +792,9 @@ struct f2fs_inode_info {#endif struct list_head dirty_list;/* dirty list for dirs and files */ struct list_head gdirty_list;/* linked in global dirty list */ -struct list_head inmem_ilist;/* list for inmem inodes */ -struct list_head inmem_pages;/* inmemory pages managed by f2fs */ -struct task_struct *inmem_task;/* store inmemory task */ -struct mutex inmem_lock;/* lock for inmemory pages */ +struct task_struct *atomic_write_task;/* store atomic write task */ struct extent_tree *extent_tree;/* cached extent_tree entry */ +struct inode *cow_inode;/* copy-on-write inode for atomic write */ /* avoid racing between foreground op and gc */ struct f2fs_rwsem i_gc_rwsem[2 ];
@@ -1093,7 +1088,6 @@ enum count_type {F2FS_DIRTY_QDATA ,F2FS_DIRTY_NODES ,F2FS_DIRTY_META , -F2FS_INMEM_PAGES ,F2FS_DIRTY_IMETA ,F2FS_WB_CP_DATA , F2FS_WB_DATA,
@@ -1725,7 +1719,6 @@ struct f2fs_sb_info {/* for skip statistic */ unsigned int atomic_files;/* # of opened atomic file */ -unsigned long long skipped_atomic_files[2 ];/* FG_GC and BG_GC */ unsigned long long skipped_gc_rwsem;/* FG_GC only */ /* threshold for gc trials on pinned files */
@@ -3203,11 +3196,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_commit_atomic_write (struct inode *inode) -{ -return is_inode_flag_set (inode,FI_ATOMIC_COMMIT ); -} -static inline bool f2fs_is_volatile_file (struct inode *inode) {return is_inode_flag_set (inode,FI_VOLATILE_FILE );
@@ -3445,6 +3433,8 @@ void f2fs_handle_failed_inode(struct inode *inode);int f2fs_update_extension_list (struct f2fs_sb_info *sbi,const char *name,bool hot,bool set);struct dentry *f2fs_get_parent (struct dentry *child); +int f2fs_get_tmpfile (struct user_namespace *mnt_userns,struct inode *dir, +struct inode **new_inode);/* * dir.c
@@ -3580,11 +3570,8 @@ void f2fs_destroy_node_manager_caches(void);* segment.c */ bool f2fs_need_SSR (struct f2fs_sb_info *sbi); -void f2fs_register_inmem_page (struct inode *inode,struct page *page); -void f2fs_drop_inmem_pages_all (struct f2fs_sb_info *sbi,bool gc_failure); -void f2fs_drop_inmem_pages (struct inode *inode); -void f2fs_drop_inmem_page (struct inode *inode,struct page *page); -int f2fs_commit_inmem_pages (struct inode *inode); +int f2fs_commit_atomic_write (struct inode *inode); +void f2fs_abort_atomic_write (struct inode *inode,bool clean);void f2fs_balance_fs (struct f2fs_sb_info *sbi,bool need);void f2fs_balance_fs_bg (struct f2fs_sb_info *sbi,bool from_bg);int f2fs_issue_flush (struct f2fs_sb_info *sbi,nid_t ino);
@@ -3819,7 +3806,6 @@ struct f2fs_stat_info {int ext_tree, zombie_tree, ext_node;int ndirty_node, ndirty_dent, ndirty_meta, ndirty_imeta;int ndirty_data, ndirty_qdata; -int inmem_pages;unsigned int ndirty_dirs, ndirty_files, nquota_files, ndirty_all;int nats, dirty_nats, sits, dirty_sits;int free_nids, avail_nids, alloc_nids;
@@ -3849,7 +3835,6 @@ struct f2fs_stat_info {int bg_node_segs, bg_data_segs;int tot_blks, data_blks, node_blks;int bg_data_blks, bg_node_blks; -unsigned long long skipped_atomic_files[2 ];int curseg[NR_CURSEG_TYPE ];int cursec[NR_CURSEG_TYPE ];int curzone[NR_CURSEG_TYPE ];
fs/f2fs/file.c +26 -22
115 lines not on this page · raw message
fs/f2fs/gc.c +1 -26
@@ -1194,13 +1194,6 @@ static int move_data_block(struct inode *inode, block_t bidx, goto out; } -if (f2fs_is_atomic_file (inode)) { -F2FS_I (inode)->i_gc_failures[GC_FAILURE_ATOMIC ]++; -F2FS_I_SB (inode)->skipped_atomic_files[gc_type]++; - err = -EAGAIN ; - goto out; - } -if (f2fs_is_pinned_file (inode)) {f2fs_pin_file_control (inode, true); err = -EAGAIN ;
@@ -1344,12 +1337,6 @@ static int move_data_page(struct inode *inode, block_t bidx, int gc_type, goto out; } -if (f2fs_is_atomic_file (inode)) { -F2FS_I (inode)->i_gc_failures[GC_FAILURE_ATOMIC ]++; -F2FS_I_SB (inode)->skipped_atomic_files[gc_type]++; - err = -EAGAIN ; - goto out; - }if (f2fs_is_pinned_file (inode)) {if (gc_type ==FG_GC )f2fs_pin_file_control (inode, true);
@@ -1711,8 +1698,6 @@ int f2fs_gc(struct f2fs_sb_info *sbi, bool sync, .ilist = LIST_HEAD_INIT(gc_list.ilist), .iroot = RADIX_TREE_INIT(gc_list.iroot, GFP_NOFS), }; -unsigned long long last_skipped = sbi->skipped_atomic_files[FG_GC ]; -unsigned long long first_skipped;unsigned int skipped_round =0 , round =0 ; trace_f2fs_gc_begin(sbi->sb, sync, background,
@@ -1726,7 +1711,6 @@ int f2fs_gc(struct f2fs_sb_info *sbi, bool sync, cpc.reason =__get_cp_reason (sbi); sbi->skipped_gc_rwsem =0 ; - first_skipped = last_skipped; gc_more:if (unlikely (!(sbi->sb->s_flags &SB_ACTIVE ))) { ret = -EINVAL ;
@@ -1769,10 +1753,8 @@ int f2fs_gc(struct f2fs_sb_info *sbi, bool sync, total_freed += seg_freed;if (gc_type ==FG_GC ) { -if (sbi->skipped_atomic_files[FG_GC ] > last_skipped || - sbi->skipped_gc_rwsem) +if (sbi->skipped_gc_rwsem) skipped_round++; - last_skipped = sbi->skipped_atomic_files[FG_GC ]; round++; }
@@ -1789,13 +1771,6 @@ int f2fs_gc(struct f2fs_sb_info *sbi, bool sync, goto gc_more; } -if (first_skipped < last_skipped && - (last_skipped - first_skipped) > - sbi->skipped_gc_rwsem) { -f2fs_drop_inmem_pages_all (sbi, true); - segno =NULL_SEGNO ; - goto gc_more; - }if (gc_type ==FG_GC && !is_sbi_flag_set (sbi,SBI_CP_DISABLED )) ret =f2fs_write_checkpoint (sbi, &cpc); }
fs/f2fs/inode.c +1 -2
@@ -744,9 +744,8 @@ void f2fs_evict_inode(struct inode *inode)nid_t xnid =F2FS_I (inode)->i_xattr_nid;int err =0 ; -/* some remained atomic pages should discarded */ if (f2fs_is_atomic_file (inode)) -f2fs_drop_inmem_pages (inode); +f2fs_abort_atomic_write (inode, true);trace_f2fs_evict_inode (inode);truncate_inode_pages_final (&inode->i_data);
fs/f2fs/namei.c +19 -9
@@ -836,8 +836,8 @@ static int f2fs_mknod(struct user_namespace *mnt_userns, struct inode *dir, }static int __f2fs_tmpfile (struct user_namespace *mnt_userns,struct inode *dir, -struct dentry *dentry,umode_t mode, -struct inode **whiteout) +struct dentry *dentry,umode_t mode,bool is_whiteout, +struct inode **new_inode) {struct f2fs_sb_info *sbi =F2FS_I_SB (dir);struct inode *inode;
@@ -851,7 +851,7 @@ static int __f2fs_tmpfile(struct user_namespace *mnt_userns, struct inode *dir,if (IS_ERR (inode))return PTR_ERR (inode); -if (whiteout) { +if (is_whiteout) {init_special_inode (inode, inode->i_mode,WHITEOUT_DEV ); inode->i_op = &f2fs_special_inode_operations; }else {
@@ -876,21 +876,25 @@ static int __f2fs_tmpfile(struct user_namespace *mnt_userns, struct inode *dir,f2fs_add_orphan_inode (inode);f2fs_alloc_nid_done (sbi, inode->i_ino); -if (whiteout) { +if (is_whiteout) {f2fs_i_links_write (inode, false);spin_lock (&inode->i_lock); inode->i_state |=I_LINKABLE ;spin_unlock (&inode->i_lock); - - *whiteout = inode; }else { -d_tmpfile (dentry, inode); +if (dentry) +d_tmpfile (dentry, inode); +else +f2fs_i_links_write (inode, false); }/* link_count was changed by d_tmpfile as well. */ f2fs_unlock_op (sbi);unlock_new_inode (inode); +if (new_inode) + *new_inode = inode; +f2fs_balance_fs (sbi, true);return 0 ;
@@ -911,7 +915,7 @@ static int f2fs_tmpfile(struct user_namespace *mnt_userns, struct inode *dir,if (!f2fs_is_checkpoint_ready (sbi))return -ENOSPC ; -return __f2fs_tmpfile (mnt_userns, dir, dentry, mode,NULL ); +return __f2fs_tmpfile (mnt_userns, dir, dentry, mode, false,NULL ); } static int f2fs_create_whiteout(struct user_namespace *mnt_userns,
@@ -921,7 +925,13 @@ static int f2fs_create_whiteout(struct user_namespace *mnt_userns,return -EIO ;return __f2fs_tmpfile (mnt_userns, dir,NULL , -S_IFCHR |WHITEOUT_MODE , whiteout); +S_IFCHR |WHITEOUT_MODE , true, whiteout); +} + +int f2fs_get_tmpfile (struct user_namespace *mnt_userns,struct inode *dir, +struct inode **new_inode) +{ +return __f2fs_tmpfile (mnt_userns, dir,NULL ,S_IFREG , false, new_inode); } static int f2fs_rename(struct user_namespace *mnt_userns, struct inode *old_dir,
fs/f2fs/node.c +0 -4
@@ -90,10 +90,6 @@ bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type)atomic_read (&sbi->total_ext_node) * sizeof(struct extent_node)) >> PAGE_SHIFT; res = mem_size < ((avail_ram * nm_i->ram_thresh /100 ) >>1 ); - }else if (type ==INMEM_PAGES ) { -/* it allows 20% / total_ram for inmemory pages */ - mem_size =get_pages (sbi,F2FS_INMEM_PAGES ); - res = mem_size < (val.totalram /5 ); }else if (type ==DISCARD_CACHE ) { mem_size = (atomic_read (&dcc->discard_cmd_cnt) *sizeof (struct discard_cmd )) >>PAGE_SHIFT ;
fs/f2fs/node.h +0 -1
@@ -147,7 +147,6 @@ enum mem_type {DIRTY_DENTS ,/* indicates dirty dentry pages */ INO_ENTRIES ,/* indicates inode entries */ EXTENT_CACHE ,/* indicates extent cache */ -INMEM_PAGES ,/* indicates inmemory pages */ DISCARD_CACHE ,/* indicates memory of cached discard cmds */ COMPRESS_PAGE ,/* indicates memory of cached compressed pages */ BASE_CHECK, /* check kernel status */
fs/f2fs/segment.c +125 -249
446 lines not on this page · raw message
fs/f2fs/segment.h +2 -2
@@ -224,10 +224,10 @@ struct segment_allocation {#define MAX_SKIP_GC_COUNT 16 -struct inmem_pages { +struct revoke_entry {struct list_head list; -struct page *page;block_t old_addr;/* for revoking when fail to commit */ +pgoff_t index; };struct sit_info {
fs/f2fs/super.c +1 -5
@@ -1359,9 +1359,6 @@ static struct inode *f2fs_alloc_inode(struct super_block *sb)spin_lock_init (&fi->i_size_lock);INIT_LIST_HEAD (&fi->dirty_list);INIT_LIST_HEAD (&fi->gdirty_list); -INIT_LIST_HEAD (&fi->inmem_ilist); -INIT_LIST_HEAD (&fi->inmem_pages); -mutex_init (&fi->inmem_lock);init_f2fs_rwsem (&fi->i_gc_rwsem[READ ]);init_f2fs_rwsem (&fi->i_gc_rwsem[WRITE ]);init_f2fs_rwsem (&fi->i_xattr_sem);
@@ -1402,9 +1399,8 @@ static int f2fs_drop_inode(struct inode *inode)atomic_inc (&inode->i_count);spin_unlock (&inode->i_lock); -/* some remained atomic pages should discarded */ if (f2fs_is_atomic_file (inode)) -f2fs_drop_inmem_pages (inode); +f2fs_abort_atomic_write (inode, true);/* should remain fi->extent_tree for writepage */ f2fs_destroy_extent_node (inode);
Signature · 1 line
2.35.1.1094.g7c7d902a7c-goog