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

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

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: fix infinite loop in nilfs_palloc_freev function
parents 622b9f15 349dbc36

fs/nilfs2/alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) 
	unsigned long group, group_offset;

	int i, j, n, ret;



	for (i = 0; i < nitems; i += n) {

	for (i = 0; i < nitems; i = j) {

		group = nilfs_palloc_group(inode, entry_nrs[i], &group_offset);

		ret = nilfs_palloc_get_desc_block(inode, group, 0, &desc_bh);

		if (ret < 0)