f2fs: introduce F2FS_I_SB, F2FS_M_SB, and F2FS_P_SB
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/6 f2fs: introduce F2FS_I_SB, F2FS_M_SB, and F2FS_P_SB
This patch adds three inline functions to clean up dirty casting codes.
--- fs/f2fs/checkpoint.c | 18 +++++++----------- fs/f2fs/data.c | 31 ++++++++++++++----------------- fs/f2fs/dir.c | 13 +++++-------- fs/f2fs/f2fs.h | 23 +++++++++++++++++++---- fs/f2fs/file.c | 20 ++++++++++---------- fs/f2fs/inline.c | 13 +++++-------- fs/f2fs/inode.c | 8 ++++---- fs/f2fs/namei.c | 21 ++++++++++----------- fs/f2fs/node.c | 43 +++++++++++++++++-------------------------- fs/f2fs/node.h | 3 +-- fs/f2fs/recovery.c | 2 +- fs/f2fs/segment.c | 14 ++++++-------- fs/f2fs/segment.h | 2 +- fs/f2fs/xattr.c | 6 +++--- 14 files changed, 103 insertions(+), 114 deletions(-)
fs/f2fs/checkpoint.c +7 -11
@@ -151,8 +151,7 @@ out:static int f2fs_write_meta_page (struct page *page,struct writeback_control *wbc) { -struct inode *inode = page->mapping->host; -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_P_SB (page);trace_f2fs_writepage (page,META );
@@ -177,7 +176,7 @@ redirty_out:static int f2fs_write_meta_pages (struct address_space *mapping,struct writeback_control *wbc) { -struct f2fs_sb_info *sbi =F2FS_SB (mapping->host->i_sb); +struct f2fs_sb_info *sbi =F2FS_M_SB (mapping);long diff, written;trace_f2fs_writepages (mapping->host, wbc,META );
@@ -259,15 +258,12 @@ continue_unlock:static int f2fs_set_meta_page_dirty (struct page *page) { -struct address_space *mapping = page->mapping; -struct f2fs_sb_info *sbi =F2FS_SB (mapping->host->i_sb); -trace_f2fs_set_page_dirty (page,META );SetPageUptodate (page);if (!PageDirty (page)) {__set_page_dirty_nobuffers (page); -inc_page_count (sbi,F2FS_DIRTY_META ); +inc_page_count (F2FS_P_SB (page),F2FS_DIRTY_META );return 1 ; }return 0 ;
@@ -619,7 +615,7 @@ fail_no_cp:static int __add_dirty_inode (struct inode *inode,struct dir_inode_entry *new) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);if (is_inode_flag_set (F2FS_I (inode),FI_DIRTY_DIR ))return -EEXIST ;
@@ -633,7 +629,7 @@ static int __add_dirty_inode(struct inode *inode, struct dir_inode_entry *new)void set_dirty_dir_page (struct inode *inode,struct page *page) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct dir_inode_entry *new;int ret =0 ;
@@ -656,7 +652,7 @@ void set_dirty_dir_page(struct inode *inode, struct page *page)void add_dirty_dir_inode (struct inode *inode) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct dir_inode_entry *new =f2fs_kmem_cache_alloc (inode_entry_slab,GFP_NOFS );int ret =0 ;
@@ -674,7 +670,7 @@ void add_dirty_dir_inode(struct inode *inode)void remove_dirty_dir_inode (struct inode *inode) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct dir_inode_entry *entry;if (!S_ISDIR (inode->i_mode))
fs/f2fs/data.c +14 -17
@@ -236,7 +236,7 @@ static void __set_data_blkaddr(struct dnode_of_data *dn, block_t new_addr)int reserve_new_block (struct dnode_of_data *dn) { -struct f2fs_sb_info *sbi =F2FS_SB (dn->inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (dn->inode);if (unlikely (is_inode_flag_set (F2FS_I (dn->inode),FI_NO_ALLOC )))return -EPERM ;
@@ -396,7 +396,6 @@ end_update:struct page *find_data_page (struct inode *inode,pgoff_t index,bool sync) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb);struct address_space *mapping = inode->i_mapping;struct dnode_of_data dn;struct page *page;
@@ -429,7 +428,7 @@ struct page *find_data_page(struct inode *inode, pgoff_t index, bool sync)return page; } - err =f2fs_submit_page_bio (sbi, page, dn.data_blkaddr, + err =f2fs_submit_page_bio (F2FS_I_SB (inode), page, dn.data_blkaddr, sync ?READ_SYNC :READA );if (err)return ERR_PTR (err);
@@ -451,7 +450,6 @@ struct page *find_data_page(struct inode *inode, pgoff_t index, bool sync)*/ struct page *get_lock_data_page (struct inode *inode,pgoff_t index) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb);struct address_space *mapping = inode->i_mapping;struct dnode_of_data dn;struct page *page;
@@ -490,7 +488,8 @@ repeat:return page; } - err =f2fs_submit_page_bio (sbi, page, dn.data_blkaddr,READ_SYNC ); + err =f2fs_submit_page_bio (F2FS_I_SB (inode), page, + dn.data_blkaddr,READ_SYNC );if (err)return ERR_PTR (err);
@@ -517,7 +516,6 @@ repeat:struct page *get_new_data_page (struct inode *inode,struct page *ipage,pgoff_t index,bool new_i_size) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb);struct address_space *mapping = inode->i_mapping;struct page *page;struct dnode_of_data dn;
@@ -541,8 +539,8 @@ repeat:zero_user_segment (page,0 ,PAGE_CACHE_SIZE );SetPageUptodate (page); }else { - err =f2fs_submit_page_bio (sbi, page, dn.data_blkaddr, -READ_SYNC ); + err =f2fs_submit_page_bio (F2FS_I_SB (inode), page, + dn.data_blkaddr,READ_SYNC );if (err) goto put_err;
@@ -573,7 +571,7 @@ put_err:static int __allocate_data_block (struct dnode_of_data *dn) { -struct f2fs_sb_info *sbi =F2FS_SB (dn->inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (dn->inode);struct f2fs_summary sum;block_t new_blkaddr;struct node_info ni;
@@ -614,7 +612,6 @@ static int __allocate_data_block(struct dnode_of_data *dn)static int __get_data_block (struct inode *inode,sector_t iblock,struct buffer_head *bh_result,int create,bool fiemap) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb);unsigned int blkbits = inode->i_sb->s_blocksize_bits;unsigned maxblocks = bh_result->b_size >> blkbits;struct dnode_of_data dn;
@@ -630,8 +627,8 @@ static int __get_data_block(struct inode *inode, sector_t iblock, goto out;if (create) { -f2fs_balance_fs (sbi); -f2fs_lock_op (sbi); +f2fs_balance_fs (F2FS_I_SB (inode)); +f2fs_lock_op (F2FS_I_SB (inode)); }/* When reading holes, we need its node page */
@@ -707,7 +704,7 @@ put_out:f2fs_put_dnode (&dn); unlock_out:if (create) -f2fs_unlock_op (sbi); +f2fs_unlock_op (F2FS_I_SB (inode)); out:trace_f2fs_get_data_block (inode, iblock, bh_result, err);return err;
@@ -804,7 +801,7 @@ static int f2fs_write_data_page(struct page *page, struct writeback_control *wbc) {struct inode *inode = page->mapping->host; -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);loff_t i_size =i_size_read (inode);const pgoff_t end_index = ((unsigned long long ) i_size) >>PAGE_CACHE_SHIFT ;
@@ -892,7 +889,7 @@ static int f2fs_write_data_pages(struct address_space *mapping, struct writeback_control *wbc) {struct inode *inode = mapping->host; -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);bool locked = false;int ret;long diff;
@@ -945,7 +942,7 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, struct page **pagep, void **fsdata) { struct inode *inode = mapping->host; -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct page *page;pgoff_t index = ((unsigned long long ) pos) >>PAGE_CACHE_SHIFT ;struct dnode_of_data dn;
@@ -1093,7 +1090,7 @@ static ssize_t f2fs_direct_IO(int rw, struct kiocb *iocb,return 0 ;/* clear fsync mark to recover these blocks */ -fsync_mark_clear (F2FS_SB (inode->i_sb), inode->i_ino); +fsync_mark_clear (F2FS_I_SB (inode), inode->i_ino);trace_f2fs_direct_IO_enter (inode, offset, count, rw);
fs/f2fs/dir.c +5 -8
@@ -284,10 +284,9 @@ static void init_dent_inode(const struct qstr *name, struct page *ipage)int update_dent_inode (struct inode *inode,const struct qstr *name) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb);struct page *page; - page =get_node_page (sbi, inode->i_ino); + page =get_node_page (F2FS_I_SB (inode), inode->i_ino);if (IS_ERR (page))return PTR_ERR (page);
@@ -337,7 +336,6 @@ static int make_empty_dir(struct inode *inode,static struct page *init_inode_metadata (struct inode *inode,struct inode *dir,const struct qstr *name) { -struct f2fs_sb_info *sbi =F2FS_SB (dir->i_sb);struct page *page;int err;
@@ -360,7 +358,7 @@ static struct page *init_inode_metadata(struct inode *inode,if (err) goto put_error; }else { - page =get_node_page (F2FS_SB (dir->i_sb), inode->i_ino); + page =get_node_page (F2FS_I_SB (dir), inode->i_ino);if (IS_ERR (page))return page;
@@ -381,7 +379,7 @@ static struct page *init_inode_metadata(struct inode *inode,* we should remove this inode from orphan list. */ if (inode->i_nlink ==0 ) -remove_orphan_inode (sbi, inode->i_ino); +remove_orphan_inode (F2FS_I_SB (dir), inode->i_ino);inc_nlink (inode); }return page;
@@ -571,8 +569,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, {struct f2fs_dentry_block *dentry_blk;unsigned int bit_pos; -struct address_space *mapping = page->mapping; -struct inode *dir = mapping->host; +struct inode *dir = page->mapping->host;int slots =GET_DENTRY_SLOTS (le16_to_cpu (dentry->name_len));int i;
@@ -594,7 +591,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, dir->i_ctime = dir->i_mtime =CURRENT_TIME ;if (inode) { -struct f2fs_sb_info *sbi =F2FS_SB (dir->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (dir);down_write (&F2FS_I (inode)->i_sem);
fs/f2fs/f2fs.h +19 -4
@@ -539,6 +539,21 @@ static inline struct f2fs_sb_info *F2FS_SB(struct super_block *sb)return sb->s_fs_info; } +static inline struct f2fs_sb_info *F2FS_I_SB (struct inode *inode) +{ +return F2FS_SB (inode->i_sb); +} + +static inline struct f2fs_sb_info *F2FS_M_SB (struct address_space *mapping) +{ +return F2FS_I_SB (mapping->host); +} + +static inline struct f2fs_sb_info *F2FS_P_SB (struct page *page) +{ +return F2FS_M_SB (page->mapping); +} +static inline struct f2fs_super_block *F2FS_RAW_SUPER (struct f2fs_sb_info *sbi) {return (struct f2fs_super_block *)(sbi->raw_super);
@@ -718,7 +733,7 @@ static inline void inc_page_count(struct f2fs_sb_info *sbi, int count_type)static inline void inode_inc_dirty_dents (struct inode *inode) { -inc_page_count (F2FS_SB (inode->i_sb),F2FS_DIRTY_DENTS ); +inc_page_count (F2FS_I_SB (inode),F2FS_DIRTY_DENTS );atomic_inc (&F2FS_I (inode)->dirty_dents); }
@@ -732,7 +747,7 @@ static inline void inode_dec_dirty_dents(struct inode *inode)if (!S_ISDIR (inode->i_mode))return ; -dec_page_count (F2FS_SB (inode->i_sb),F2FS_DIRTY_DENTS ); +dec_page_count (F2FS_I_SB (inode),F2FS_DIRTY_DENTS );atomic_dec (&F2FS_I (inode)->dirty_dents); }
@@ -1359,12 +1374,12 @@ static inline struct f2fs_stat_info *F2FS_STAT(struct f2fs_sb_info *sbi)#define stat_inc_inline_inode (inode) \ do { \ if (f2fs_has_inline_data(inode)) \ - ((F2FS_SB(inode->i_sb))->inline_inode++); \ + ((F2FS_I_SB(inode))->inline_inode++); \ } while (0)#define stat_dec_inline_inode (inode) \ do { \ if (f2fs_has_inline_data(inode)) \ - ((F2FS_SB(inode->i_sb))->inline_inode--); \ + ((F2FS_I_SB(inode))->inline_inode--); \ } while (0)#define stat_inc_seg_type (sbi, curseg) \
fs/f2fs/file.c +10 -10
@@ -33,7 +33,7 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma, {struct page *page = vmf->page;struct inode *inode =file_inode (vma->vm_file); -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct dnode_of_data dn;int err;
@@ -117,7 +117,7 @@ static int get_parent_ino(struct inode *inode, nid_t *pino)static inline bool need_do_checkpoint (struct inode *inode) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);bool need_cp = false;if (!S_ISREG (inode->i_mode) || inode->i_nlink !=1 )
@@ -138,7 +138,7 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) {struct inode *inode = file->f_mapping->host;struct f2fs_inode_info *fi =F2FS_I (inode); -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);int ret =0 ;bool need_cp = false;struct writeback_control wbc = {
@@ -226,7 +226,7 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) flush_out:remove_dirty_inode (sbi, inode->i_ino,UPDATE_INO );clear_inode_flag (fi,FI_UPDATE_WRITE ); - ret =f2fs_issue_flush (F2FS_SB (inode->i_sb)); + ret =f2fs_issue_flush (F2FS_I_SB (inode)); } out:trace_f2fs_sync_file_exit (inode, need_cp, datasync, ret);
@@ -369,7 +369,7 @@ static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma)int truncate_data_blocks_range (struct dnode_of_data *dn,int count) {int nr_free =0 , ofs = dn->ofs_in_node; -struct f2fs_sb_info *sbi =F2FS_SB (dn->inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (dn->inode);struct f2fs_node *raw_node;__le32 *addr;
@@ -432,7 +432,7 @@ out:int truncate_blocks (struct inode *inode,u64 from,bool lock) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);unsigned int blocksize = inode->i_sb->s_blocksize;struct dnode_of_data dn;pgoff_t free_from;
@@ -555,7 +555,7 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)truncate_setsize (inode, attr->ia_size);f2fs_truncate (inode); -f2fs_balance_fs (F2FS_SB (inode->i_sb)); +f2fs_balance_fs (F2FS_I_SB (inode)); }__setattr_copy (inode, attr);
@@ -589,7 +589,7 @@ const struct inode_operations f2fs_file_inode_operations = {static void fill_zero (struct inode *inode,pgoff_t index,loff_t start,loff_t len) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct page *page;if (!len)
@@ -661,7 +661,7 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len)if (pg_start < pg_end) {struct address_space *mapping = inode->i_mapping;loff_t blk_start, blk_end; -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);f2fs_balance_fs (sbi);
@@ -682,7 +682,7 @@ static int punch_hole(struct inode *inode, loff_t offset, loff_t len)static int expand_inode_data (struct inode *inode,loff_t offset,loff_t len,int mode) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);pgoff_t index, pg_start, pg_end;loff_t new_size =i_size_read (inode);loff_t off_start, off_end;
fs/f2fs/inline.c +5 -8
@@ -15,11 +15,10 @@bool f2fs_may_inline (struct inode *inode) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb);block_t nr_blocks;loff_t i_size; -if (!test_opt (sbi,INLINE_DATA )) +if (!test_opt (F2FS_I_SB (inode),INLINE_DATA ))return false; nr_blocks =F2FS_I (inode)->i_xattr_nid ?3 :2 ;
@@ -35,7 +34,6 @@ bool f2fs_may_inline(struct inode *inode)int f2fs_read_inline_data (struct inode *inode,struct page *page) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb);struct page *ipage;void *src_addr, *dst_addr;
@@ -44,7 +42,7 @@ int f2fs_read_inline_data(struct inode *inode, struct page *page) goto out; } - ipage =get_node_page (sbi, inode->i_ino); + ipage =get_node_page (F2FS_I_SB (inode), inode->i_ino);if (IS_ERR (ipage)) {unlock_page (page);return PTR_ERR (ipage);
@@ -73,7 +71,7 @@ static int __f2fs_convert_inline_data(struct inode *inode, struct page *page)struct dnode_of_data dn;void *src_addr, *dst_addr;block_t new_blk_addr; -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct f2fs_io_info fio = { .type =DATA , .rw =WRITE_SYNC |REQ_PRIO ,
@@ -189,13 +187,12 @@ int f2fs_write_inline_data(struct inode *inode,void truncate_inline_data (struct inode *inode,u64 from) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb);struct page *ipage;if (from >=MAX_INLINE_DATA )return ; - ipage =get_node_page (sbi, inode->i_ino); + ipage =get_node_page (F2FS_I_SB (inode), inode->i_ino);if (IS_ERR (ipage))return ;
@@ -209,7 +206,7 @@ void truncate_inline_data(struct inode *inode, u64 from)bool recover_inline_data (struct inode *inode,struct page *npage) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct f2fs_inode *ri =NULL ;void *src_addr, *dst_addr;struct page *ipage;
fs/f2fs/inode.c +4 -4
@@ -69,7 +69,7 @@ static void __set_inode_rdev(struct inode *inode, struct f2fs_inode *ri)static int do_read_inode (struct inode *inode) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct f2fs_inode_info *fi =F2FS_I (inode);struct page *node_page;struct f2fs_inode *ri;
@@ -218,7 +218,7 @@ void update_inode(struct inode *inode, struct page *node_page)void update_inode_page (struct inode *inode) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct page *node_page; retry: node_page =get_node_page (sbi, inode->i_ino);
@@ -238,7 +238,7 @@ retry:int f2fs_write_inode (struct inode *inode,struct writeback_control *wbc) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);if (inode->i_ino ==F2FS_NODE_INO (sbi) || inode->i_ino ==F2FS_META_INO (sbi))
@@ -266,7 +266,7 @@ int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc)*/ void f2fs_evict_inode (struct inode *inode) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);nid_t xnid =F2FS_I (inode)->i_xattr_nid;trace_f2fs_evict_inode (inode);
fs/f2fs/namei.c +10 -11
@@ -23,7 +23,7 @@static struct inode *f2fs_new_inode (struct inode *dir,umode_t mode) { -struct f2fs_sb_info *sbi =F2FS_SB (dir->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (dir);nid_t ino;struct inode *inode;bool nid_free = false;
@@ -102,7 +102,7 @@ static inline void set_cold_files(struct f2fs_sb_info *sbi, struct inode *inode,static int f2fs_create (struct inode *dir,struct dentry *dentry,umode_t mode,bool excl) { -struct f2fs_sb_info *sbi =F2FS_SB (dir->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (dir);struct inode *inode;nid_t ino =0 ;int err;
@@ -143,7 +143,7 @@ static int f2fs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry) {struct inode *inode = old_dentry->d_inode; -struct f2fs_sb_info *sbi =F2FS_SB (dir->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (dir);int err;f2fs_balance_fs (sbi);
@@ -203,7 +203,7 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry,static int f2fs_unlink (struct inode *dir,struct dentry *dentry) { -struct f2fs_sb_info *sbi =F2FS_SB (dir->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (dir);struct inode *inode = dentry->d_inode;struct f2fs_dir_entry *de;struct page *page;
@@ -237,7 +237,7 @@ fail:static int f2fs_symlink (struct inode *dir,struct dentry *dentry,const char *symname) { -struct f2fs_sb_info *sbi =F2FS_SB (dir->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (dir);struct inode *inode;size_t symlen =strlen (symname) +1 ;int err;
@@ -272,7 +272,7 @@ out:static int f2fs_mkdir (struct inode *dir,struct dentry *dentry,umode_t mode) { -struct f2fs_sb_info *sbi =F2FS_SB (dir->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (dir);struct inode *inode;int err;
@@ -320,7 +320,7 @@ static int f2fs_rmdir(struct inode *dir, struct dentry *dentry)static int f2fs_mknod (struct inode *dir,struct dentry *dentry,umode_t mode,dev_t rdev) { -struct f2fs_sb_info *sbi =F2FS_SB (dir->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (dir);struct inode *inode;int err =0 ;
@@ -356,7 +356,7 @@ out:static int f2fs_rename (struct inode *old_dir,struct dentry *old_dentry,struct inode *new_dir,struct dentry *new_dentry) { -struct f2fs_sb_info *sbi =F2FS_SB (old_dir->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (old_dir);struct inode *old_inode = old_dentry->d_inode;struct inode *new_inode = new_dentry->d_inode;struct page *old_dir_page;
@@ -480,8 +480,7 @@ out:static int f2fs_cross_rename (struct inode *old_dir,struct dentry *old_dentry,struct inode *new_dir,struct dentry *new_dentry) { -struct super_block *sb = old_dir->i_sb; -struct f2fs_sb_info *sbi =F2FS_SB (sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (old_dir);struct inode *old_inode = old_dentry->d_inode;struct inode *new_inode = new_dentry->d_inode;struct page *old_dir_page, *new_dir_page;
@@ -642,7 +641,7 @@ static int f2fs_rename2(struct inode *old_dir, struct dentry *old_dentry,static int f2fs_tmpfile (struct inode *dir,struct dentry *dentry,umode_t mode) { -struct f2fs_sb_info *sbi =F2FS_SB (dir->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (dir);struct inode *inode;int err;
fs/f2fs/node.c +17 -26
180 lines not on this page · raw message
fs/f2fs/node.h +1 -2
@@ -197,8 +197,7 @@ static inline void copy_node_footer(struct page *dst, struct page *src)static inline void fill_node_footer_blkaddr (struct page *page,block_t blkaddr) { -struct f2fs_sb_info *sbi =F2FS_SB (page->mapping->host->i_sb); -struct f2fs_checkpoint *ckpt =F2FS_CKPT (sbi); +struct f2fs_checkpoint *ckpt =F2FS_CKPT (F2FS_P_SB (page));struct f2fs_node *rn =F2FS_NODE (page); rn->footer.cp_ver = ckpt->checkpoint_ver;
fs/f2fs/recovery.c +1 -1
@@ -75,7 +75,7 @@ retry: err = -EEXIST ; goto out_unmap_put; } - err =acquire_orphan_inode (F2FS_SB (inode->i_sb)); + err =acquire_orphan_inode (F2FS_I_SB (inode));if (err) {iput (einode); goto out_unmap_put;
fs/f2fs/segment.c +6 -8
@@ -953,15 +953,14 @@ static int __get_segment_type_6(struct page *page, enum page_type p_type)static int __get_segment_type (struct page *page,enum page_type p_type) { -struct f2fs_sb_info *sbi =F2FS_SB (page->mapping->host->i_sb); -switch (sbi->active_logs) { +switch (F2FS_P_SB (page)->active_logs) {case 2 :return __get_segment_type_2 (page, p_type);case 4 :return __get_segment_type_4 (page, p_type); }/* NR_CURSEG_TYPE(6) logs by default */ -f2fs_bug_on (sbi->active_logs !=NR_CURSEG_TYPE ); +f2fs_bug_on (F2FS_P_SB (page)->active_logs !=NR_CURSEG_TYPE );return __get_segment_type_6 (page, p_type); }
@@ -1041,7 +1040,7 @@ void write_node_page(struct f2fs_sb_info *sbi, struct page *page,void write_data_page (struct page *page,struct dnode_of_data *dn,block_t *new_blkaddr,struct f2fs_io_info *fio) { -struct f2fs_sb_info *sbi =F2FS_SB (dn->inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (dn->inode);struct f2fs_summary sum;struct node_info ni;
@@ -1055,9 +1054,7 @@ void write_data_page(struct page *page, struct dnode_of_data *dn,void rewrite_data_page (struct page *page,block_t old_blkaddr,struct f2fs_io_info *fio) { -struct inode *inode = page->mapping->host; -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); -f2fs_submit_page_mbio (sbi, page, old_blkaddr, fio); +f2fs_submit_page_mbio (F2FS_P_SB (page), page, old_blkaddr, fio); } void recover_data_page(struct f2fs_sb_info *sbi,
@@ -1130,8 +1127,9 @@ out:void f2fs_wait_on_page_writeback (struct page *page,enum page_type type) { -struct f2fs_sb_info *sbi =F2FS_SB (page->mapping->host->i_sb);if (PageWriteback (page)) { +struct f2fs_sb_info *sbi =F2FS_P_SB (page); +if (is_merged_page (sbi, page, type))f2fs_submit_merged_bio (sbi, type,WRITE );wait_on_page_writeback (page);
fs/f2fs/segment.h +1 -1
@@ -480,7 +480,7 @@ enum {static inline bool need_inplace_update (struct inode *inode) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);/* IPU can be done only for the user data */ if (S_ISDIR (inode->i_mode))
fs/f2fs/xattr.c +3 -3
@@ -266,7 +266,7 @@ static struct f2fs_xattr_entry *__find_xattr(void *base_addr, int index,static void *read_all_xattrs (struct inode *inode,struct page *ipage) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);struct f2fs_xattr_header *header;size_t size =PAGE_SIZE , inline_size =0 ;void *txattr_addr;
@@ -325,7 +325,7 @@ fail:static inline int write_all_xattrs (struct inode *inode,__u32 hsize,void *txattr_addr,struct page *ipage) { -struct f2fs_sb_info *sbi =F2FS_SB (inode->i_sb); +struct f2fs_sb_info *sbi =F2FS_I_SB (inode);size_t inline_size =0 ;void *xattr_addr;struct page *xpage;
@@ -596,7 +596,7 @@ int f2fs_setxattr(struct inode *inode, int index, const char *name, const void *value, size_t size, struct page *ipage, int flags) { - struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); + struct f2fs_sb_info *sbi = F2FS_I_SB(inode);int err;/* this case is only from init_inode_metadata */
Signature · 7 lines
1.8.5.2 (Apple Git-48) ------------------------------------------------------------------------------ Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/
Jaegeuk Kim
maintainerPATCH 2/6 f2fs: remain inconsistency information to initiate fsck.f2fs
This patch adds sbi->need_fsck to conduct fsck.f2fs later. This flag is only able to be removed by fsck.f2fs.
--- fs/f2fs/checkpoint.c | 3 +++ fs/f2fs/f2fs.h | 1 + fs/f2fs/super.c | 1 + include/linux/f2fs_fs.h | 1 + 4 files changed, 6 insertions(+)
fs/f2fs/checkpoint.c +3 -0
@@ -882,6 +882,9 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount)else clear_ckpt_flags (ckpt,CP_ORPHAN_PRESENT_FLAG ); +if (sbi->need_fsck) +set_ckpt_flags (ckpt,CP_FSCK_FLAG ); +/* update SIT/NAT bitmap */ get_sit_bitmap (sbi,__bitmap_ptr (sbi,SIT_BITMAP ));get_nat_bitmap (sbi,__bitmap_ptr (sbi,NAT_BITMAP ));
fs/f2fs/f2fs.h +1 -0
@@ -434,6 +434,7 @@ struct f2fs_sb_info {struct buffer_head *raw_super_buf;/* buffer head of raw sb */ struct f2fs_super_block *raw_super;/* raw super block pointer */ int s_dirty;/* dirty flag for checkpoint */ +bool need_fsck;/* need fsck.f2fs to fix */ /* for node-related operations */ struct f2fs_nm_info *nm_info;/* node manager */
fs/f2fs/super.c +1 -0
@@ -849,6 +849,7 @@ static void init_sb_info(struct f2fs_sb_info *sbi)atomic_set (&sbi->nr_pages[i],0 ); sbi->dir_level =DEF_DIR_LEVEL ; + sbi->need_fsck = false; }/*
include/linux/f2fs_fs.h +1 -0
@@ -85,6 +85,7 @@ struct f2fs_super_block {/* * For checkpoint */ +#define CP_FSCK_FLAG 0x00000010#define CP_ERROR_FLAG 0x00000008#define CP_COMPACT_SUM_FLAG 0x00000004#define CP_ORPHAN_PRESENT_FLAG 0x00000002
Signature · 7 lines
1.8.5.2 (Apple Git-48) ------------------------------------------------------------------------------ Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/
Jaegeuk Kim
maintainerPATCH 3/6 f2fs: need fsck.f2fs when f2fs_bug_on is triggered
In reply to Jaegeuk KimIf any f2fs_bug_on is triggered, fsck.f2fs is needed.
--- fs/f2fs/checkpoint.c | 6 +++--- fs/f2fs/data.c | 4 ++-- fs/f2fs/dir.c | 4 ++-- fs/f2fs/f2fs.h | 26 ++++++++++++++--------- fs/f2fs/file.c | 2 +- fs/f2fs/inline.c | 4 ++-- fs/f2fs/inode.c | 2 +- fs/f2fs/node.c | 58 ++++++++++++++++++++++++++-------------------------- fs/f2fs/recovery.c | 8 ++++---- fs/f2fs/segment.c | 17 +++++++-------- fs/f2fs/xattr.c | 2 +- 11 files changed, 70 insertions(+), 63 deletions(-)
fs/f2fs/checkpoint.c +3 -3
@@ -374,7 +374,7 @@ int acquire_orphan_inode(struct f2fs_sb_info *sbi)void release_orphan_inode (struct f2fs_sb_info *sbi) {spin_lock (&sbi->ino_lock[ORPHAN_INO ]); -f2fs_bug_on (sbi->n_orphans ==0 ); +f2fs_bug_on (sbi, sbi->n_orphans ==0 ); sbi->n_orphans--;spin_unlock (&sbi->ino_lock[ORPHAN_INO ]); }
@@ -394,7 +394,7 @@ void remove_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino)static void recover_orphan_inode (struct f2fs_sb_info *sbi,nid_t ino) {struct inode *inode =f2fs_iget (sbi->sb, ino); -f2fs_bug_on (IS_ERR (inode)); +f2fs_bug_on (sbi,IS_ERR (inode));clear_nlink (inode);/* truncate all the data during iput */
@@ -455,7 +455,7 @@ static void write_orphan_inodes(struct f2fs_sb_info *sbi, block_t start_blk)list_for_each_entry (orphan, head, list) {if (!page) { page =find_get_page (META_MAPPING (sbi), start_blk++); -f2fs_bug_on (!page); +f2fs_bug_on (sbi, !page); orphan_blk = (struct f2fs_orphan_block *)page_address (page);memset (orphan_blk,0 ,sizeof (*orphan_blk));
fs/f2fs/data.c +2 -2
@@ -258,7 +258,7 @@ int f2fs_reserve_block(struct dnode_of_data *dn, pgoff_t index)int err;/* if inode_page exists, index should be zero */ -f2fs_bug_on (!need_put && index); +f2fs_bug_on (F2FS_I_SB (dn->inode), !need_put && index); err =get_dnode_of_data (dn, index,ALLOC_NODE );if (err)
@@ -321,7 +321,7 @@ void update_extent_cache(block_t blk_addr, struct dnode_of_data *dn)block_t start_blkaddr, end_blkaddr;int need_update = true; -f2fs_bug_on (blk_addr ==NEW_ADDR ); +f2fs_bug_on (F2FS_I_SB (dn->inode), blk_addr ==NEW_ADDR ); fofs =start_bidx_of_node (ofs_of_node (dn->node_page), fi) + dn->ofs_in_node;
fs/f2fs/dir.c +2 -2
@@ -126,7 +126,7 @@ static struct f2fs_dir_entry *find_in_block(struct page *dentry_page,* For the most part, it should be a bug when name_len is zero. * We stop here for figuring out where the bugs has occurred. */ -f2fs_bug_on (!de->name_len); +f2fs_bug_on (F2FS_P_SB (dentry_page), !de->name_len); bit_pos +=GET_DENTRY_SLOTS (le16_to_cpu (de->name_len)); }
@@ -151,7 +151,7 @@ static struct f2fs_dir_entry *find_in_level(struct inode *dir,bool room = false;int max_slots =0 ; -f2fs_bug_on (level >MAX_DIR_HASH_DEPTH ); +f2fs_bug_on (F2FS_I_SB (dir), level >MAX_DIR_HASH_DEPTH ); nbucket =dir_buckets (level,F2FS_I (dir)->i_dir_level); nblock =bucket_blocks (level);
fs/f2fs/f2fs.h +16 -10
@@ -21,10 +21,16 @@#include <linux/sched.h> #ifdef CONFIG_F2FS_CHECK_FS -#define f2fs_bug_on (condition) BUG_ON(condition) +#define f2fs_bug_on (sbi, condition) BUG_ON(condition)#define f2fs_down_write (x, y) down_write_nest_lock(x, y)#else -#define f2fs_bug_on (condition) WARN_ON(condition) +#define f2fs_bug_on (sbi, condition) \ + do { \ + if (unlikely(condition)) { \ + WARN_ON(1); \ + sbi->need_fsck = true; \ + } \ + } while (0)#define f2fs_down_write (x, y) down_write(x)#endif
@@ -719,8 +725,8 @@ static inline void dec_valid_block_count(struct f2fs_sb_info *sbi, blkcnt_t count) {spin_lock (&sbi->stat_lock); -f2fs_bug_on (sbi->total_valid_block_count < (block_t ) count); -f2fs_bug_on (inode->i_blocks < count); +f2fs_bug_on (sbi, sbi->total_valid_block_count < (block_t ) count); +f2fs_bug_on (sbi, inode->i_blocks < count); inode->i_blocks -= count; sbi->total_valid_block_count -= (block_t )count;spin_unlock (&sbi->stat_lock);
@@ -864,9 +870,9 @@ static inline void dec_valid_node_count(struct f2fs_sb_info *sbi, {spin_lock (&sbi->stat_lock); -f2fs_bug_on (!sbi->total_valid_block_count); -f2fs_bug_on (!sbi->total_valid_node_count); -f2fs_bug_on (!inode->i_blocks); +f2fs_bug_on (sbi, !sbi->total_valid_block_count); +f2fs_bug_on (sbi, !sbi->total_valid_node_count); +f2fs_bug_on (sbi, !inode->i_blocks); inode->i_blocks--; sbi->total_valid_node_count--;
@@ -883,7 +889,7 @@ static inline unsigned int valid_node_count(struct f2fs_sb_info *sbi)static inline void inc_valid_inode_count (struct f2fs_sb_info *sbi) {spin_lock (&sbi->stat_lock); -f2fs_bug_on (sbi->total_valid_inode_count == sbi->total_node_count); +f2fs_bug_on (sbi, sbi->total_valid_inode_count == sbi->total_node_count); sbi->total_valid_inode_count++;spin_unlock (&sbi->stat_lock); }
@@ -891,7 +897,7 @@ static inline void inc_valid_inode_count(struct f2fs_sb_info *sbi)static inline void dec_valid_inode_count (struct f2fs_sb_info *sbi) {spin_lock (&sbi->stat_lock); -f2fs_bug_on (!sbi->total_valid_inode_count); +f2fs_bug_on (sbi, !sbi->total_valid_inode_count); sbi->total_valid_inode_count--;spin_unlock (&sbi->stat_lock); }
@@ -907,7 +913,7 @@ static inline void f2fs_put_page(struct page *page, int unlock)return ;if (unlock) { -f2fs_bug_on (!PageLocked (page)); +f2fs_bug_on (F2FS_P_SB (page), !PageLocked (page));unlock_page (page); }page_cache_release (page);
fs/f2fs/file.c +1 -1
@@ -463,7 +463,7 @@ int truncate_blocks(struct inode *inode, u64 from, bool lock) count =ADDRS_PER_PAGE (dn.node_page,F2FS_I (inode)); count -= dn.ofs_in_node; -f2fs_bug_on (count <0 ); +f2fs_bug_on (sbi, count <0 );if (dn.ofs_in_node ||IS_INODE (dn.node_page)) {truncate_data_blocks_range (&dn, count);
fs/f2fs/inline.c +2 -2
@@ -226,7 +226,7 @@ bool recover_inline_data(struct inode *inode, struct page *npage) ri && (ri->i_inline & F2FS_INLINE_DATA)) { process_inline: ipage =get_node_page (sbi, inode->i_ino); -f2fs_bug_on (IS_ERR (ipage)); +f2fs_bug_on (sbi,IS_ERR (ipage));f2fs_wait_on_page_writeback (ipage,NODE );
@@ -240,7 +240,7 @@ process_inline:if (f2fs_has_inline_data (inode)) { ipage =get_node_page (sbi, inode->i_ino); -f2fs_bug_on (IS_ERR (ipage)); +f2fs_bug_on (sbi,IS_ERR (ipage));f2fs_wait_on_page_writeback (ipage,NODE );zero_user_segment (ipage,INLINE_DATA_OFFSET ,INLINE_DATA_OFFSET +MAX_INLINE_DATA );
fs/f2fs/inode.c +1 -1
@@ -276,7 +276,7 @@ void f2fs_evict_inode(struct inode *inode) inode->i_ino == F2FS_META_INO(sbi)) goto out_clear; -f2fs_bug_on (get_dirty_dents (inode)); +f2fs_bug_on (sbi,get_dirty_dents (inode));remove_dirty_dir_inode (inode);if (inode->i_nlink ||is_bad_inode (inode))
fs/f2fs/node.c +29 -29
198 lines not on this page · raw message
fs/f2fs/recovery.c +4 -4
@@ -331,8 +331,8 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,f2fs_wait_on_page_writeback (dn.node_page,NODE );get_node_info (sbi, dn.nid, &ni); -f2fs_bug_on (ni.ino !=ino_of_node (page)); -f2fs_bug_on (ofs_of_node (dn.node_page) !=ofs_of_node (page)); +f2fs_bug_on (sbi, ni.ino !=ino_of_node (page)); +f2fs_bug_on (sbi,ofs_of_node (dn.node_page) !=ofs_of_node (page));for (; start < end; start++) {block_t src, dest;
@@ -344,7 +344,7 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,if (src ==NULL_ADDR ) { err =reserve_new_block (&dn);/* We should not get -ENOSPC */ -f2fs_bug_on (err); +f2fs_bug_on (sbi, err); }/* Check the previous node page having this index */
@@ -474,7 +474,7 @@ int recover_fsync_data(struct f2fs_sb_info *sbi)/* step #2: recover data */ err =recover_data (sbi, &inode_list,CURSEG_WARM_NODE );if (!err) -f2fs_bug_on (!list_empty (&inode_list)); +f2fs_bug_on (sbi, !list_empty (&inode_list)); out:destroy_fsync_dnodes (&inode_list);kmem_cache_destroy (fsync_entry_slab);
fs/f2fs/segment.c +9 -8
@@ -516,7 +516,7 @@ static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del) new_vblocks = se->valid_blocks + del; offset =GET_BLKOFF_FROM_SEG0 (sbi, blkaddr); -f2fs_bug_on ((new_vblocks >> (sizeof (unsigned short ) <<3 ) || +f2fs_bug_on (sbi, (new_vblocks >> (sizeof (unsigned short ) <<3 ) || (new_vblocks > sbi->blocks_per_seg))); se->valid_blocks = new_vblocks;
@@ -558,7 +558,7 @@ void invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr)unsigned int segno =GET_SEGNO (sbi, addr);struct sit_info *sit_i =SIT_I (sbi); -f2fs_bug_on (addr ==NULL_ADDR ); +f2fs_bug_on (sbi, addr ==NULL_ADDR );if (addr ==NEW_ADDR )return ;
@@ -671,7 +671,7 @@ find_other_zone:if (dir ==ALLOC_RIGHT ) { secno =find_next_zero_bit (free_i->free_secmap,TOTAL_SECS (sbi),0 ); -f2fs_bug_on (secno >=TOTAL_SECS (sbi)); +f2fs_bug_on (sbi, secno >=TOTAL_SECS (sbi)); }else { go_left =1 ; left_start = hint -1 ;
@@ -687,7 +687,7 @@ find_other_zone: } left_start =find_next_zero_bit (free_i->free_secmap,TOTAL_SECS (sbi),0 ); -f2fs_bug_on (left_start >=TOTAL_SECS (sbi)); +f2fs_bug_on (sbi, left_start >=TOTAL_SECS (sbi));break ; } secno = left_start;
@@ -726,7 +726,7 @@ skip_left: } got_it:/* set it as dirty segment in free segmap */ -f2fs_bug_on (test_bit (segno, free_i->free_segmap)); +f2fs_bug_on (sbi,test_bit (segno, free_i->free_segmap));__set_inuse (sbi, segno); *newseg = segno;write_unlock (&free_i->segmap_lock);
@@ -960,7 +960,8 @@ static int __get_segment_type(struct page *page, enum page_type p_type)return __get_segment_type_4 (page, p_type); }/* NR_CURSEG_TYPE(6) logs by default */ -f2fs_bug_on (F2FS_P_SB (page)->active_logs !=NR_CURSEG_TYPE ); +f2fs_bug_on (F2FS_P_SB (page), +F2FS_P_SB (page)->active_logs !=NR_CURSEG_TYPE );return __get_segment_type_6 (page, p_type); }
@@ -1044,7 +1045,7 @@ void write_data_page(struct page *page, struct dnode_of_data *dn,struct f2fs_summary sum;struct node_info ni; -f2fs_bug_on (dn->data_blkaddr ==NULL_ADDR ); +f2fs_bug_on (sbi, dn->data_blkaddr ==NULL_ADDR );get_node_info (sbi, dn->nid, &ni);set_summary (&sum, dn->nid, dn->ofs_in_node, ni.version);
@@ -1424,7 +1425,7 @@ static struct page *get_next_sit_page(struct f2fs_sb_info *sbi,/* get current sit block page without lock */ src_page =get_meta_page (sbi, src_off); dst_page =grab_meta_page (sbi, dst_off); -f2fs_bug_on (PageDirty (src_page)); +f2fs_bug_on (sbi,PageDirty (src_page)); src_addr =page_address (src_page); dst_addr =page_address (dst_page);
fs/f2fs/xattr.c +1 -1
@@ -373,7 +373,7 @@ static inline int write_all_xattrs(struct inode *inode, __u32 hsize,alloc_nid_failed (sbi, new_nid);return PTR_ERR (xpage); } -f2fs_bug_on (new_nid); +f2fs_bug_on (sbi, new_nid);f2fs_wait_on_page_writeback (xpage,NODE ); }else {struct dnode_of_data dn;
Signature · 7 lines
1.8.5.2 (Apple Git-48) ------------------------------------------------------------------------------ Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/
Jaegeuk Kim
maintainerPATCH 4/6 f2fs: add BUG cases to initiate fsck.f2fs
In reply to Jaegeuk KimThis patch replaces BUG cases with f2fs_bug_on to remain fsck.f2fs information. And it implements some void functions to initiate fsck.f2fs too.
--- fs/f2fs/segment.c | 4 ++-- fs/f2fs/segment.h | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 5 deletions(-)
fs/f2fs/segment.c +2 -2
@@ -526,10 +526,10 @@ static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del)/* Update valid block bitmap */ if (del >0 ) {if (f2fs_set_bit (offset, se->cur_valid_map)) -BUG (); +f2fs_bug_on (sbi,1 ); }else {if (!f2fs_clear_bit (offset, se->cur_valid_map)) -BUG (); +f2fs_bug_on (sbi,1 ); }if (!f2fs_test_bit (offset, se->ckpt_valid_map)) se->ckpt_valid_blocks += del;
fs/f2fs/segment.h +35 -3
@@ -583,9 +583,41 @@ static inline void check_block_count(struct f2fs_sb_info *sbi,BUG_ON (GET_SIT_VBLOCKS (raw_sit) != valid_blocks); }#else -#define check_seg_range (sbi, segno) -#define verify_block_addr (sbi, blk_addr) -#define check_block_count (sbi, segno, raw_sit) +static inline void check_seg_range (struct f2fs_sb_info *sbi,unsigned int segno) +{ +unsigned int end_segno =SM_I (sbi)->segment_count -1 ; + +if (segno > end_segno) + sbi->need_fsck = true; +} + +static inline void verify_block_addr (struct f2fs_sb_info *sbi,block_t blk_addr) +{ +struct f2fs_sm_info *sm_info =SM_I (sbi); +block_t total_blks = sm_info->segment_count << sbi->log_blocks_per_seg; +block_t start_addr = sm_info->seg0_blkaddr; +block_t end_addr = start_addr + total_blks -1 ; + +if (blk_addr < start_addr || blk_addr > end_addr) + sbi->need_fsck = true; +} + +/* +* Summary block is always treated as an invalid block +*/ +static inline void check_block_count (struct f2fs_sb_info *sbi, +int segno,struct f2fs_sit_entry *raw_sit) +{ +unsigned int end_segno =SM_I (sbi)->segment_count -1 ; + +/* check segment usage */ +if (GET_SIT_VBLOCKS (raw_sit) > sbi->blocks_per_seg) + sbi->need_fsck = true; + +/* check boundary of a given segment number */ +if (segno > end_segno) + sbi->need_fsck = true; +}#endif static inline pgoff_t current_sit_addr(struct f2fs_sb_info *sbi,
Signature · 7 lines
1.8.5.2 (Apple Git-48) ------------------------------------------------------------------------------ Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/
Jaegeuk Kim
maintainerPATCH 5/6 f2fs: handle bug cases by letting fsck.f2fs initiate
In reply to Jaegeuk KimThis patch adds to handle corner buggy cases for fsck.f2fs.
--- fs/f2fs/segment.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
fs/f2fs/segment.c +9 -1
@@ -317,6 +317,10 @@ static void __locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno,struct seg_entry *sentry =get_seg_entry (sbi, segno);enum dirty_type t = sentry->type; +if (unlikely (t >=DIRTY )) { +f2fs_bug_on (sbi,1 ); +return ; + }if (!test_and_set_bit (segno, dirty_i->dirty_segmap[t])) dirty_i->nr_dirty[t]++; }
@@ -1745,8 +1749,12 @@ static void init_dirty_segmap(struct f2fs_sb_info *sbi)break ; offset = segno +1 ; valid_blocks =get_valid_blocks (sbi, segno,0 ); -if (valid_blocks >= sbi->blocks_per_seg || !valid_blocks) +if (valid_blocks == sbi->blocks_per_seg || !valid_blocks)continue ; +if (valid_blocks > sbi->blocks_per_seg) { +f2fs_bug_on (sbi,1 ); +continue ; + }mutex_lock (&dirty_i->seglist_lock);__locate_dirty_segment (sbi, segno,DIRTY );mutex_unlock (&dirty_i->seglist_lock);
Signature · 7 lines
1.8.5.2 (Apple Git-48) ------------------------------------------------------------------------------ Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/
Jaegeuk Kim
maintainerPATCH 6/6 f2fs: need fsck.f2fs if the recovery was failed
In reply to Jaegeuk KimIf the roll-forward recovery was failed, we'd better conduct fsck.f2fs.
--- fs/f2fs/super.c | 3 +++ 1 file changed, 3 insertions(+)
fs/f2fs/super.c +3 -0
@@ -1083,6 +1083,9 @@ try_onemore:if (err) goto free_proc; +if (!retry) + sbi->need_fsck = true; +/* recover fsynced data */ if (!test_opt (sbi,DISABLE_ROLL_FORWARD )) { err =recover_fsync_data (sbi);
Signature · 7 lines
1.8.5.2 (Apple Git-48) ------------------------------------------------------------------------------ Slashdot TV. Video for Nerds. Stuff that matters. http://tv.slashdot.org/