diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-09-16 18:30:54 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2014-09-23 11:10:24 -0700 |
| commit | 9b5f136fd41658f384a5b4ea49d8ef37036e15f5 (patch) | |
| tree | 9264f0986377dfdb252db27ba59fbb2cb1210bce /fs/f2fs | |
| parent | 210f41bc048263d572515e1e0edc28d362ce673e (diff) | |
| download | linux-9b5f136fd41658f384a5b4ea49d8ef37036e15f5.tar.gz linux-9b5f136fd41658f384a5b4ea49d8ef37036e15f5.tar.bz2 linux-9b5f136fd41658f384a5b4ea49d8ef37036e15f5.zip | |
f2fs: change the ipu_policy option to enable combinations
This patch changes the ipu_policy setting to use any combination of orthogonal policies.
Signed-off-by: Changman Lee <cm224.lee@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/segment.c | 2 | ||||
| -rw-r--r-- | fs/f2fs/segment.h | 39 |
2 files changed, 17 insertions, 24 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 24b768ae39c4..3125a3d35245 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -1928,7 +1928,7 @@ int build_segment_manager(struct f2fs_sb_info *sbi) sm_info->ssa_blkaddr = le32_to_cpu(raw_super->ssa_blkaddr); sm_info->rec_prefree_segments = sm_info->main_segments * DEF_RECLAIM_PREFREE_SEGMENTS / 100; - sm_info->ipu_policy = F2FS_IPU_FSYNC; + sm_info->ipu_policy = 1 << F2FS_IPU_FSYNC; sm_info->min_ipu_util = DEF_MIN_IPU_UTIL; sm_info->min_fsync_blocks = DEF_MIN_FSYNC_BLOCKS; diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h index 032c0905a12b..d317b61f83a5 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -487,40 +487,33 @@ enum { F2FS_IPU_UTIL, F2FS_IPU_SSR_UTIL, F2FS_IPU_FSYNC, - F2FS_IPU_DISABLE, }; static inline bool need_inplace_update(struct inode *inode) { struct f2fs_sb_info *sbi = F2FS_I_SB(inode); + unsigned int policy = SM_I(sbi)->ipu_policy; /* IPU can be done only for the user data */ if (S_ISDIR(inode->i_mode)) return false; - switch (SM_I(sbi)->ipu_policy) { - case F2FS_IPU_FORCE: + if (policy & (0x1 << F2FS_IPU_FORCE)) return true; - case F2FS_IPU_SSR: - if (need_SSR(sbi)) - return true; - break; - case F2FS_IPU_UTIL: - if (utilization(sbi) > SM_I(sbi)->min_ipu_util) - return true; - break; - case F2FS_IPU_SSR_UTIL: - if (need_SSR(sbi) && utilization(sbi) > SM_I(sbi)->min_ipu_util) - return true; - break; - case F2FS_IPU_FSYNC: - /* this is only set during fdatasync */ - if (is_inode_flag_set(F2FS_I(inode), FI_NEED_IPU)) - return true; - break; - case F2FS_IPU_DISABLE: - break; - } + if (policy & (0x1 << F2FS_IPU_SSR) && need_SSR(sbi)) + return true; + if (policy & (0x1 << F2FS_IPU_UTIL) && + utilization(sbi) > SM_I(sbi)->min_ipu_util) + return true; + if (policy & (0x1 << F2FS_IPU_SSR_UTIL) && need_SSR(sbi) && + utilization(sbi) > SM_I(sbi)->min_ipu_util) + return true; + + /* this is only set during fdatasync */ + if (policy & (0x1 << F2FS_IPU_FSYNC) && + is_inode_flag_set(F2FS_I(inode), FI_NEED_IPU)) + return true; + return false; } |