From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932874Ab1EJQAQ (ORCPT ); Tue, 10 May 2011 12:00:16 -0400 Received: from sh.osrg.net ([192.16.179.4]:40119 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932855Ab1EJQAP (ORCPT ); Tue, 10 May 2011 12:00:15 -0400 Date: Wed, 11 May 2011 00:59:38 +0900 (JST) Message-Id: <20110511.005938.137710056.ryusuke@osrg.net> To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, Ryusuke Konishi , linux-nilfs@vger.kernel.org Subject: [GIT PULL] nilfs2 fix for 2.6.39 From: Ryusuke Konishi X-Mailer: Mew version 5.2 on Emacs 22.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Wed, 11 May 2011 00:59:39 +0900 (JST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git for-linus to grab one regression fix. This corrects an infinite loop bug that happened in an abnormal condition. Thanks, Ryusuke Konishi -- The following changes since commit 693d92a1bbc9e42681c42ed190bd42b636ca876f: Linux 2.6.39-rc7 (2011-05-09 19:33:54 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git fixes Ryusuke Konishi (1): nilfs2: fix infinite loop in nilfs_palloc_freev function 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 0a0a66d..f768448 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)