diff options
author | Jaegeuk Kim <jaegeuk.kim@samsung.com> | 2014-03-17 23:33:06 -0400 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk.kim@samsung.com> | 2014-03-17 23:34:30 -0400 |
commit | f8b2c1f940dca2843fe13b55ba5868bac8040551 (patch) | |
tree | 3ef6e0fb1b088148800c74343ab8a02264b073ba /fs | |
parent | 04c0938844695ab97b79a477a9f57748fe97d2f5 (diff) |
f2fs: introduce get_dirty_dents for readability
The get_dirty_dents gives us the number of dirty dentry pages.
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/f2fs/checkpoint.c | 2 | ||||
-rw-r--r-- | fs/f2fs/f2fs.h | 5 | ||||
-rw-r--r-- | fs/f2fs/inode.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index 911b6f9e9f7b..4c0e98ddf3db 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c | |||
@@ -619,7 +619,7 @@ void remove_dirty_dir_inode(struct inode *inode) | |||
619 | return; | 619 | return; |
620 | 620 | ||
621 | spin_lock(&sbi->dir_inode_lock); | 621 | spin_lock(&sbi->dir_inode_lock); |
622 | if (atomic_read(&F2FS_I(inode)->dirty_dents)) { | 622 | if (get_dirty_dents(inode)) { |
623 | spin_unlock(&sbi->dir_inode_lock); | 623 | spin_unlock(&sbi->dir_inode_lock); |
624 | return; | 624 | return; |
625 | } | 625 | } |
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 292cc3c25b28..59fac1a9f0c2 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h | |||
@@ -704,6 +704,11 @@ static inline int get_pages(struct f2fs_sb_info *sbi, int count_type) | |||
704 | return atomic_read(&sbi->nr_pages[count_type]); | 704 | return atomic_read(&sbi->nr_pages[count_type]); |
705 | } | 705 | } |
706 | 706 | ||
707 | static inline int get_dirty_dents(struct inode *inode) | ||
708 | { | ||
709 | return atomic_read(&F2FS_I(inode)->dirty_dents); | ||
710 | } | ||
711 | |||
707 | static inline int get_blocktype_secs(struct f2fs_sb_info *sbi, int block_type) | 712 | static inline int get_blocktype_secs(struct f2fs_sb_info *sbi, int block_type) |
708 | { | 713 | { |
709 | unsigned int pages_per_sec = sbi->segs_per_sec * | 714 | unsigned int pages_per_sec = sbi->segs_per_sec * |
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index d518e37df3a7..0d8e4a2302b7 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c | |||
@@ -273,7 +273,7 @@ void f2fs_evict_inode(struct inode *inode) | |||
273 | inode->i_ino == F2FS_META_INO(sbi)) | 273 | inode->i_ino == F2FS_META_INO(sbi)) |
274 | goto no_delete; | 274 | goto no_delete; |
275 | 275 | ||
276 | f2fs_bug_on(atomic_read(&F2FS_I(inode)->dirty_dents)); | 276 | f2fs_bug_on(get_dirty_dents(inode)); |
277 | remove_dirty_dir_inode(inode); | 277 | remove_dirty_dir_inode(inode); |
278 | 278 | ||
279 | if (inode->i_nlink || is_bad_inode(inode)) | 279 | if (inode->i_nlink || is_bad_inode(inode)) |