Messages in this thread Patch in this message | | | Date | Tue, 28 Jul 2009 16:41:05 -0700 | From | Greg KH <> | Subject | [patch 36/71] nilfs2: fix disorder in cp count on error during deleting checkpoints |
| |
2.6.30-stable review patch. If anyone has any objections, please let us know.
------------------
From: Jiro SEKIBA <jir@unicus.jp>
commit d9a0a345ab7a58a30ec38e5bb7401a28714914d2 upstream.
This fixes a bug that checkpoint count gets wrong on errors when deleting a series of checkpoints.
The count error is persistent since the checkpoint count is stored on disk. Some userland programs refer to the count via ioctl, and this bugfix is needed to prevent malfunction of such programs.
Signed-off-by: Jiro SEKIBA <jir@unicus.jp> Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- fs/nilfs2/cpfile.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
--- a/fs/nilfs2/cpfile.c +++ b/fs/nilfs2/cpfile.c @@ -311,7 +311,7 @@ int nilfs_cpfile_delete_checkpoints(stru 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; @@ -344,7 +344,7 @@ int nilfs_cpfile_delete_checkpoints(stru continue; printk(KERN_ERR "%s: cannot delete block\n", __func__); - goto out_header; + break; } } @@ -362,7 +362,6 @@ int nilfs_cpfile_delete_checkpoints(stru kunmap_atomic(kaddr, KM_USER0); } - out_header: brelse(header_bh); out_sem:
| |