diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-10 09:41:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-10 09:41:03 -0700 |
| commit | c269a1b2f482b8ad923b0601bb584f6389df5c4c (patch) | |
| tree | bec0aa041a6a403fc27cd76801fe3ea539b300f8 /fs | |
| parent | 622b9f152447c0fae9662446c948c8ae8f136e1c (diff) | |
| parent | 349dbc3669d043e656f3ed48c7bfe073ca1c6326 (diff) | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nilfs2/alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nilfs2/alloc.c b/fs/nilfs2/alloc.c index 0a0a66d98cc..f7684483785 100644 --- a/fs/nilfs2/alloc.c +++ b/fs/nilfs2/alloc.c @@ -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) |