cp_payload is introduced for sit bitmap to support large volume, and it is
just after the block of f2fs_checkpoint + nat bitmap, so the first segment
should include F2FS_CP_PACKS + NR_CURSEG_TYPE + cp_payload + orphan blocks.
However, current max orphan inodes calculation don't consider cp_payload,
this patch fix it by reducing the number of cp_payload from total blocks of
the first segment when calculate max orphan inodes.
Signed-off-by: Wanpeng Li <[email protected]>
---
fs/f2fs/checkpoint.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index db82e09..3c9d677 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -1109,7 +1109,7 @@ void init_ino_entry_info(struct f2fs_sb_info *sbi)
* for cp pack we can have max 1020*504 orphan entries
*/
sbi->max_orphans = (sbi->blocks_per_seg - F2FS_CP_PACKS -
- NR_CURSEG_TYPE) * F2FS_ORPHANS_PER_BLOCK;
+ NR_CURSEG_TYPE - __cp_payload(sbi)) * F2FS_ORPHANS_PER_BLOCK;
}
int __init create_checkpoint_caches(void)
--
1.9.1
Hi Chao,
On Fri, Feb 27, 2015 at 05:39:39PM +0800, Chao Yu wrote:
>Hi Wanpeng,
>
>> -----Original Message-----
>> From: Wanpeng Li [mailto:[email protected]]
>> Sent: Friday, February 27, 2015 3:05 PM
>> To: Jaegeuk Kim
>> Cc: Wanpeng Li; [email protected]; [email protected]
>> Subject: [f2fs-dev] [PATCH] f2fs: fix max orphan inodes calculation
>>
>> cp_payload is introduced for sit bitmap to support large volume, and it is
>> just after the block of f2fs_checkpoint + nat bitmap, so the first segment
>> should include F2FS_CP_PACKS + NR_CURSEG_TYPE + cp_payload + orphan blocks.
>> However, current max orphan inodes calculation don't consider cp_payload,
>> this patch fix it by reducing the number of cp_payload from total blocks of
>> the first segment when calculate max orphan inodes.
>>
>> Signed-off-by: Wanpeng Li <[email protected]>
>> ---
>> fs/f2fs/checkpoint.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
>> index db82e09..3c9d677 100644
>> --- a/fs/f2fs/checkpoint.c
>> +++ b/fs/f2fs/checkpoint.c
>> @@ -1109,7 +1109,7 @@ void init_ino_entry_info(struct f2fs_sb_info *sbi)
>> * for cp pack we can have max 1020*504 orphan entries
>
>The description above should be wrong, can you please update it in this patch?
Ok, I will adjust the comments above the codes.
>
>> */
>> sbi->max_orphans = (sbi->blocks_per_seg - F2FS_CP_PACKS -
>> - NR_CURSEG_TYPE) * F2FS_ORPHANS_PER_BLOCK;
>> + NR_CURSEG_TYPE - __cp_payload(sbi)) * F2FS_ORPHANS_PER_BLOCK;
>
>There is a trivial coding style issue: "line over 80 characters"
Will fix it.
Regards,
Wanpeng Li
>
>Thanks,
>
Hi Wanpeng,
> -----Original Message-----
> From: Wanpeng Li [mailto:[email protected]]
> Sent: Friday, February 27, 2015 3:05 PM
> To: Jaegeuk Kim
> Cc: Wanpeng Li; [email protected]; [email protected]
> Subject: [f2fs-dev] [PATCH] f2fs: fix max orphan inodes calculation
>
> cp_payload is introduced for sit bitmap to support large volume, and it is
> just after the block of f2fs_checkpoint + nat bitmap, so the first segment
> should include F2FS_CP_PACKS + NR_CURSEG_TYPE + cp_payload + orphan blocks.
> However, current max orphan inodes calculation don't consider cp_payload,
> this patch fix it by reducing the number of cp_payload from total blocks of
> the first segment when calculate max orphan inodes.
>
> Signed-off-by: Wanpeng Li <[email protected]>
> ---
> fs/f2fs/checkpoint.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
> index db82e09..3c9d677 100644
> --- a/fs/f2fs/checkpoint.c
> +++ b/fs/f2fs/checkpoint.c
> @@ -1109,7 +1109,7 @@ void init_ino_entry_info(struct f2fs_sb_info *sbi)
> * for cp pack we can have max 1020*504 orphan entries
The description above should be wrong, can you please update it in this patch?
> */
> sbi->max_orphans = (sbi->blocks_per_seg - F2FS_CP_PACKS -
> - NR_CURSEG_TYPE) * F2FS_ORPHANS_PER_BLOCK;
> + NR_CURSEG_TYPE - __cp_payload(sbi)) * F2FS_ORPHANS_PER_BLOCK;
There is a trivial coding style issue: "line over 80 characters"
Thanks,