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

Commit c1c0cbb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: fix potential leak of dirty data on umount
parents c80d292f 3256a055

fs/nilfs2/segment.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2829,7 +2829,7 @@ static void nilfs_segctor_destroy(struct nilfs_sc_info *sci) 
		|| sci->sc_seq_request != sci->sc_seq_done);

		|| sci->sc_seq_request != sci->sc_seq_done);

	spin_unlock(&sci->sc_state_lock);

	spin_unlock(&sci->sc_state_lock);





	if (flag || nilfs_segctor_confirm(sci))

	if (flag || !nilfs_segctor_confirm(sci))

		nilfs_segctor_write_out(sci);

		nilfs_segctor_write_out(sci);





	WARN_ON(!list_empty(&sci->sc_copied_buffers));

	WARN_ON(!list_empty(&sci->sc_copied_buffers));