[PATCH] f2fs: fix recover orphan inodes

[PATCH] f2fs: fix recover orphan inodes

[Wanpeng Li]

recover_orphan_inodes is used to recover orphan inodes, the meta pages 
which readahead should be orphan_blkaddr - start_blk instead of orphan_blkaddr.
This patch fix it.

Signed-off-by: Wanpeng Li <wanpeng.li@linux.intel.com>
---
 fs/f2fs/checkpoint.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index e6c271f..0f42ff3 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -468,9 +468,9 @@ void recover_orphan_inodes(struct f2fs_sb_info *sbi)
 		le32_to_cpu(F2FS_RAW_SUPER(sbi)->cp_payload);
 	orphan_blkaddr = __start_sum_addr(sbi) - 1;
 
-	ra_meta_pages(sbi, start_blk, orphan_blkaddr, META_CP);
+	ra_meta_pages(sbi, start_blk, orphan_blkaddr - start_blk, META_CP);
 
-	for (i = 0; i < orphan_blkaddr; i++) {
+	for (i = 0; i < orphan_blkaddr - start_blk; i++) {
 		struct page *page = get_meta_page(sbi, start_blk + i);
 		struct f2fs_orphan_block *orphan_blk;
 
-- 
1.9.1

Re: [PATCH] f2fs: fix recover orphan inodes

[Jaegeuk Kim]

Hi Wanpeng,

On Wed, Feb 25, 2015 at 12:53:37PM +0800, Wanpeng Li wrote:
> recover_orphan_inodes is used to recover orphan inodes, the meta pages 
> which readahead should be orphan_blkaddr - start_blk instead of orphan_blkaddr.
> This patch fix it.
> 
> Signed-off-by: Wanpeng Li <wanpeng.li@linux.intel.com>
> ---
>  fs/f2fs/checkpoint.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
> index e6c271f..0f42ff3 100644
> --- a/fs/f2fs/checkpoint.c
> +++ b/fs/f2fs/checkpoint.c
> @@ -468,9 +468,9 @@ void recover_orphan_inodes(struct f2fs_sb_info *sbi)
>  		le32_to_cpu(F2FS_RAW_SUPER(sbi)->cp_payload);

Actually it seems the name, orphan_blkaddr, was wrong.
That should be orphan_blocks which is no need to fix like this.

Instead, I found there is another bug below.

>  	orphan_blkaddr = __start_sum_addr(sbi) - 1;
        orphan_blocks = __start_sum_addr(sbi) - 1 - 
			le32_to_cpu(F2FS_RAW_SUPER(sbi)->cp_payload);

It may help to define a macro to get cp_payload.

>  
> -	ra_meta_pages(sbi, start_blk, orphan_blkaddr, META_CP);
> +	ra_meta_pages(sbi, start_blk, orphan_blkaddr - start_blk, META_CP);

The orphan_blocks is enough. No need to fix this.

>  
> -	for (i = 0; i < orphan_blkaddr; i++) {
> +	for (i = 0; i < orphan_blkaddr - start_blk; i++) {

ditto.

Thanks,

Re: [PATCH] f2fs: fix recover orphan inodes

[Wanpeng Li]

Hi Jaegeuk,
On Wed, Feb 25, 2015 at 10:35:23AM -0800, Jaegeuk Kim wrote:
>Hi Wanpeng,
>
>On Wed, Feb 25, 2015 at 12:53:37PM +0800, Wanpeng Li wrote:
>> recover_orphan_inodes is used to recover orphan inodes, the meta pages 
>> which readahead should be orphan_blkaddr - start_blk instead of orphan_blkaddr.
>> This patch fix it.
>> 
>> Signed-off-by: Wanpeng Li <wanpeng.li@linux.intel.com>
>> ---
>>  fs/f2fs/checkpoint.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
>> index e6c271f..0f42ff3 100644
>> --- a/fs/f2fs/checkpoint.c
>> +++ b/fs/f2fs/checkpoint.c
>> @@ -468,9 +468,9 @@ void recover_orphan_inodes(struct f2fs_sb_info *sbi)
>>  		le32_to_cpu(F2FS_RAW_SUPER(sbi)->cp_payload);
>
>Actually it seems the name, orphan_blkaddr, was wrong.
>That should be orphan_blocks which is no need to fix like this.
>
>Instead, I found there is another bug below.
>
>>  	orphan_blkaddr = __start_sum_addr(sbi) - 1;
>        orphan_blocks = __start_sum_addr(sbi) - 1 - 
>			le32_to_cpu(F2FS_RAW_SUPER(sbi)->cp_payload);

Indeed, I will send a patch to fix it.

>
>It may help to define a macro to get cp_payload.
>

Will do. Thanks for your help. ;-)

Regards,
Wanpeng Li 

>>  
>> -	ra_meta_pages(sbi, start_blk, orphan_blkaddr, META_CP);
>> +	ra_meta_pages(sbi, start_blk, orphan_blkaddr - start_blk, META_CP);
>
>The orphan_blocks is enough. No need to fix this.
>
>>  
>> -	for (i = 0; i < orphan_blkaddr; i++) {
>> +	for (i = 0; i < orphan_blkaddr - start_blk; i++) {
>
>ditto.
>
>Thanks,