Hi Sekiba-san,
On Fri, 03 Jul 2009 15:00:33 +0900, Jiro SEKIBA <[email protected]> wrote:
> Hi,
>
> This is a patch to fix a bug that checkpoint count get wrong
> on errors when deleting series of checkpoints.
>
> Thanks,
>
> Regards
> --
> Jiro SEKIBA <[email protected]>
>
> Signed-off-by: Jiro SEKIBA <[email protected]>
Thank you for sending this!
This patch fixes possible mismatch between the number of checkpoints
and the count stored in the header block of cpfile.
Later, I will apply this to a series for 2.6.31-rc, and send it to
Linus before 2.6.31-rc3 or so.
Regards,
Ryusuke Konishi
> ---
> fs/nilfs2/cpfile.c | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/fs/nilfs2/cpfile.c b/fs/nilfs2/cpfile.c
> index 7d49813..aec942c 100644
> --- a/fs/nilfs2/cpfile.c
> +++ b/fs/nilfs2/cpfile.c
> @@ -307,7 +307,7 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,
> ret = nilfs_cpfile_get_checkpoint_block(cpfile, cno, 0, &cp_bh);
> if (ret < 0) {
> if (ret != -ENOENT)
> - goto out_header;
> + break;
> /* skip hole */
> ret = 0;
> continue;
> @@ -340,7 +340,7 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,
> continue;
> printk(KERN_ERR "%s: cannot delete block\n",
> __func__);
> - goto out_header;
> + break;
> }
> }
>
> @@ -358,7 +358,6 @@ int nilfs_cpfile_delete_checkpoints(struct inode *cpfile,
> kunmap_atomic(kaddr, KM_USER0);
> }
>
> - out_header:
> brelse(header_bh);
>
> out_sem:
> --
> 1.5.6.5
>
>
> _______________________________________________
> users mailing list
> [email protected]
> https://www.nilfs.org/mailman/listinfo/users
_______________________________________________
users mailing list
[email protected]
https://www.nilfs.org/mailman/listinfo/users
