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

Commit 3efb55b4 authored by Ryusuke Konishi's avatar Ryusuke Konishi
Browse files

nilfs2: simplify handling of active state of segments fix 



This fixes a bug of ("nilfs2: simplify handling of active state of
segments") patch.  The patch did not take account that a base index is
increased in nilfs_sufile_get_suinfo() function if requested entries
go across block boundary on sufile.

Due to this bug, the active flag sometimes appears on wrong segments
and has induced malfunction of garbage collection.

Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
parent e7a7402c

fs/nilfs2/sufile.c

+1 −1
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ ssize_t nilfs_sufile_get_suinfo(struct inode *sufile, __u64 segnum, 
			si[i + j].sui_nblocks = le32_to_cpu(su->su_nblocks);

			si[i + j].sui_flags = le32_to_cpu(su->su_flags) &

				~(1UL << NILFS_SEGMENT_USAGE_ACTIVE);

			if (nilfs_segment_is_active(nilfs, segnum + i + j))

			if (nilfs_segment_is_active(nilfs, segnum + j))

				si[i + j].sui_flags |=

					(1UL << NILFS_SEGMENT_USAGE_ACTIVE);

		}