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

Commit c640e13f 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 regression that i-flag is not set on changeless checkpoints
parents cbdbb4c1 72746ac6

fs/nilfs2/segment.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -430,7 +430,8 @@ static void nilfs_segctor_begin_finfo(struct nilfs_sc_info *sci, 
	nilfs_segctor_map_segsum_entry(

	nilfs_segctor_map_segsum_entry(

		sci, &sci->sc_binfo_ptr, sizeof(struct nilfs_finfo));

		sci, &sci->sc_binfo_ptr, sizeof(struct nilfs_finfo));





	if (inode->i_sb && !test_bit(NILFS_SC_HAVE_DELTA, &sci->sc_flags))

	if (NILFS_I(inode)->i_root &&

	    !test_bit(NILFS_SC_HAVE_DELTA, &sci->sc_flags))

		set_bit(NILFS_SC_HAVE_DELTA, &sci->sc_flags);

		set_bit(NILFS_SC_HAVE_DELTA, &sci->sc_flags);

	/* skip finfo */

	/* skip finfo */

}

}