renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 02:04:05 +08:00
Code

f2fs: convert max_orphans to a field of f2fs_sb_info

Browse Source 
Previously, we need to calculate the max orphan num when we try to acquire an
orphan inode, but it's a stable value since the super block was inited. So
converting it to a field of f2fs_sb_info and use it directly when needed seems
a better choose.

Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
This commit is contained in:
Gu Zheng 2013-12-26 18:24:19 +08:00 committed by Jaegeuk Kim
parent 944fcfc184
commit 0d47c1adc2
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/f2fs/checkpoint.c
View File

@ -194,23 +194,15 @@ const struct address_space_operations f2fs_meta_aops = {
int acquire_orphan_inode(struct f2fs_sb_info *sbi) int acquire_orphan_inode(struct f2fs_sb_info *sbi)
{ {
unsigned int max_orphans;
int err = 0; int err = 0;
/*
* considering 512 blocks in a segment 8 blocks are needed for cp
* and log segment summaries. Remaining blocks are used to keep
* orphan entries with the limitation one reserved segment
* for cp pack we can have max 1020*504 orphan entries
*/
max_orphans = (sbi->blocks_per_seg - 2 - NR_CURSEG_TYPE)
* F2FS_ORPHANS_PER_BLOCK;
mutex_lock(&sbi->orphan_inode_mutex); mutex_lock(&sbi->orphan_inode_mutex);
if (unlikely(sbi->n_orphans >= max_orphans)) if (unlikely(sbi->n_orphans >= sbi->max_orphans))
err = -ENOSPC; err = -ENOSPC;
else else
sbi->n_orphans++; sbi->n_orphans++;
mutex_unlock(&sbi->orphan_inode_mutex); mutex_unlock(&sbi->orphan_inode_mutex);
return err; return err;
} }
@ -834,6 +826,14 @@ void init_orphan_info(struct f2fs_sb_info *sbi)
mutex_init(&sbi->orphan_inode_mutex); mutex_init(&sbi->orphan_inode_mutex);
INIT_LIST_HEAD(&sbi->orphan_inode_list); INIT_LIST_HEAD(&sbi->orphan_inode_list);
sbi->n_orphans = 0; sbi->n_orphans = 0;
/*
* considering 512 blocks in a segment 8 blocks are needed for cp
* and log segment summaries. Remaining blocks are used to keep
* orphan entries with the limitation one reserved segment
* for cp pack we can have max 1020*504 orphan entries
*/
sbi->max_orphans = (sbi->blocks_per_seg - 2 - NR_CURSEG_TYPE)
* F2FS_ORPHANS_PER_BLOCK;
} }
int __init create_checkpoint_caches(void) int __init create_checkpoint_caches(void)

1
fs/f2fs/f2fs.h
View File

@ -414,6 +414,7 @@ struct f2fs_sb_info {
struct list_head orphan_inode_list; /* orphan inode list */ struct list_head orphan_inode_list; /* orphan inode list */
struct mutex orphan_inode_mutex; /* for orphan inode list */ struct mutex orphan_inode_mutex; /* for orphan inode list */
unsigned int n_orphans; /* # of orphan inodes */ unsigned int n_orphans; /* # of orphan inodes */
unsigned int max_orphans; /* max orphan inodes */
/* for directory inode management */ /* for directory inode management */
struct list_head dir_inode_list; /* dir inode list */ struct list_head dir_inode_list; /* dir inode list */