Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9a0a345 authored by Jiro SEKIBA's avatar Jiro SEKIBA Committed by Ryusuke Konishi
Browse files

nilfs2: fix disorder in cp count on error during deleting checkpoints 



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: default avatarJiro SEKIBA <jir@unicus.jp>
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Cc: stable@kernel.org
parent ff54de36

fs/nilfs2/cpfile.c

+2 −3
Original line number Diff line number Diff line
@@ -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: