f2fs: introduce f2fs_dentry_kunmap to clean up
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/2 f2fs: introduce f2fs_dentry_kunmap to clean up
This patch introduces f2fs_dentry_kunmap to clean up dirty codes.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/dir.c | 3 +-- fs/f2fs/f2fs.h | 6 ++++++ fs/f2fs/namei.c | 30 ++++++++++-------------------- fs/f2fs/recovery.c | 3 +-- 4 files changed, 18 insertions(+), 24 deletions(-)
fs/f2fs/dir.c +1 -2
@@ -271,8 +271,7 @@ ino_t f2fs_inode_by_name(struct inode *dir, struct qstr *qstr) de =f2fs_find_entry (dir, qstr, &page);if (de) { res =le32_to_cpu (de->ino); -if (!f2fs_has_inline_dentry (dir)) -kunmap (page); +f2fs_dentry_kunmap (dir, page);f2fs_put_page (page,0 ); }
fs/f2fs/f2fs.h +6 -0
@@ -1229,6 +1229,12 @@ static inline void *inline_dentry_addr(struct page *page)return (void *)&(ri->i_addr[1 ]); } +static inline void f2fs_dentry_kunmap (struct inode *dir,struct page *page) +{ +if (!f2fs_has_inline_dentry (dir)) +kunmap (page); +} +static inline int f2fs_readonly (struct super_block *sb) {return sb->s_flags &MS_RDONLY ;
fs/f2fs/namei.c +10 -20
@@ -200,8 +200,7 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry, de =f2fs_find_entry (dir, &dentry->d_name, &page);if (de) {nid_t ino =le32_to_cpu (de->ino); -if (!f2fs_has_inline_dentry (dir)) -kunmap (page); +f2fs_dentry_kunmap (dir, page);f2fs_put_page (page,0 ); inode =f2fs_iget (dir->i_sb, ino);
@@ -231,8 +230,7 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry) err =acquire_orphan_inode (sbi);if (err) {f2fs_unlock_op (sbi); -if (!f2fs_has_inline_dentry (dir)) -kunmap (page); +f2fs_dentry_kunmap (dir, page);f2fs_put_page (page,0 ); goto fail; }
@@ -469,8 +467,7 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, old_dir_page, new_dir);update_inode_page (old_inode); }else { -if (!f2fs_has_inline_dentry (old_inode)) -kunmap (old_dir_page); +f2fs_dentry_kunmap (old_inode, old_dir_page);f2fs_put_page (old_dir_page,0 ); }drop_nlink (old_dir);
@@ -486,18 +483,15 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, put_out_dir:f2fs_unlock_op (sbi); -if (!f2fs_has_inline_dentry (new_dir)) -kunmap (new_page); +f2fs_dentry_kunmap (new_dir, new_page);f2fs_put_page (new_page,0 ); out_dir:if (old_dir_entry) { -if (!f2fs_has_inline_dentry (old_inode)) -kunmap (old_dir_page); +f2fs_dentry_kunmap (old_inode, old_dir_page);f2fs_put_page (old_dir_page,0 ); } out_old: -if (!f2fs_has_inline_dentry (old_dir)) -kunmap (old_page); +f2fs_dentry_kunmap (old_dir, old_page);f2fs_put_page (old_page,0 ); out:return err;
@@ -632,23 +626,19 @@ out_unlock:f2fs_unlock_op (sbi); out_new_dir:if (new_dir_entry) { -if (!f2fs_has_inline_dentry (new_inode)) -kunmap (new_dir_page); +f2fs_dentry_kunmap (new_inode, new_dir_page);f2fs_put_page (new_dir_page,0 ); } out_old_dir:if (old_dir_entry) { -if (!f2fs_has_inline_dentry (old_inode)) -kunmap (old_dir_page); +f2fs_dentry_kunmap (old_inode, old_dir_page);f2fs_put_page (old_dir_page,0 ); } out_new: -if (!f2fs_has_inline_dentry (new_dir)) -kunmap (new_page); +f2fs_dentry_kunmap (new_dir, new_page);f2fs_put_page (new_page,0 ); out_old: -if (!f2fs_has_inline_dentry (old_dir)) -kunmap (old_page); +f2fs_dentry_kunmap (old_dir, old_page);f2fs_put_page (old_page,0 ); out:return err;
fs/f2fs/recovery.c +1 -2
@@ -129,8 +129,7 @@ retry: goto out; out_unmap_put: -if (!f2fs_has_inline_dentry (dir)) -kunmap (page); +f2fs_dentry_kunmap (dir, page);f2fs_put_page (page,0 ); out_err:iput (dir);
Signature · 1 line
2.1.1
Jaegeuk Kim
maintainerPATCH 2/2 f2fs: fix livelock calling f2fs_iget during f2fs_evict_inode
In f2fs_evict_inode,
commit_inmemory_pages
f2fs_gc
f2fs_iget
iget_locked
-> wait for inode freeHere, if the inode is same as the one to be evicted, f2fs should wait forever. Actually, we should not call f2fs_balance_fs during f2fs_evict_inode to avoid this.
But, the commit_inmem_pages calls f2fs_balance_fs by default, even if f2fs_evict_inode wants to free inmemory pages only.
Hence, this patch adds to trigger f2fs_balance_fs only when there is something to write.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/segment.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
fs/f2fs/segment.c +10 -1
@@ -230,7 +230,16 @@ void commit_inmem_pages(struct inode *inode, bool abort) .rw = WRITE_SYNC, }; -f2fs_balance_fs (sbi); +/* +* The abort is true only when f2fs_evict_inode is called. +* Basically, the f2fs_evict_inode doesn't produce any data writes, so +* that we don't need to call f2fs_balance_fs. +* Otherwise, f2fs_gc in f2fs_balance_fs can wait forever until this +* inode becomes free by iget_locked in f2fs_iget. +*/ +if (!abort) +f2fs_balance_fs (sbi); +f2fs_lock_op (sbi);mutex_lock (&fi->inmem_lock);
Signature · 9 lines
2.1.1 ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk