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

Commit 2d8428ac authored by Ryusuke Konishi's avatar Ryusuke Konishi
Browse files

nilfs2: fix duplicate call to nilfs_segctor_cancel_freev 



Andreas Beckmann gave me a report that nilfs logged the following
warnings when it got a disk full:

  nilfs_sufile_do_cancel_free: segment 0 must be clean
  nilfs_sufile_do_cancel_free: segment 1 must be clean

These arise from a duplicate call to nilfs_segctor_cancel_freev in an
error path of log writer.  This will fix the issue.

Reported-by: default avatarAndreas Beckmann <debian@abeckmann.de>
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent 220bf991

fs/nilfs2/segment.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -1510,6 +1510,12 @@ static int nilfs_segctor_collect(struct nilfs_sc_info *sci, 
		if (mode != SC_LSEG_SR || sci->sc_stage.scnt < NILFS_ST_CPFILE)

		if (mode != SC_LSEG_SR || sci->sc_stage.scnt < NILFS_ST_CPFILE)

			break;

			break;





		nilfs_clear_logs(&sci->sc_segbufs);



		err = nilfs_segctor_extend_segments(sci, nilfs, nadd);

		if (unlikely(err))

			return err;



		if (sci->sc_stage.flags & NILFS_CF_SUFREED) {

		if (sci->sc_stage.flags & NILFS_CF_SUFREED) {

			err = nilfs_sufile_cancel_freev(nilfs->ns_sufile,

			err = nilfs_sufile_cancel_freev(nilfs->ns_sufile,

							sci->sc_freesegs,

							sci->sc_freesegs,
@@ -1517,12 +1523,6 @@ static int nilfs_segctor_collect(struct nilfs_sc_info *sci, 
							NULL);

							NULL);

			WARN_ON(err); /* do not happen */

			WARN_ON(err); /* do not happen */

		}

		}

		nilfs_clear_logs(&sci->sc_segbufs);



		err = nilfs_segctor_extend_segments(sci, nilfs, nadd);

		if (unlikely(err))

			return err;



		nadd = min_t(int, nadd << 1, SC_MAX_SEGDELTA);

		nadd = min_t(int, nadd << 1, SC_MAX_SEGDELTA);

		sci->sc_stage = prev_stage;

		sci->sc_stage = prev_stage;

	}

	}