Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752896Ab0AHLDM (ORCPT ); Fri, 8 Jan 2010 06:03:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752465Ab0AHLDL (ORCPT ); Fri, 8 Jan 2010 06:03:11 -0500 Received: from er-systems.de ([85.25.136.202]:46011 "EHLO er-systems.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752807Ab0AHLDL (ORCPT ); Fri, 8 Jan 2010 06:03:11 -0500 Date: Fri, 8 Jan 2010 12:03:07 +0100 (CET) From: Thomas Voegtle To: Dmitry Monakhov cc: Dmitry Monakhov , Greg KH , Jan Kara , "Theodore Ts'o" , linux-kernel@vger.kernel.org, Andrew Morton , torvalds@linux-foundation.org, stable@kernel.org Subject: Re: [PATCH] quota: fix reserved space management for ordinary fs In-Reply-To: <87wrztpgbh.fsf_-_@openvz.org> Message-ID: References: <20100106234533.GC1960@kroah.com> <20100107180449.GA17495@suse.de> <20100107194131.GA22983@suse.de> <20100107220213.GA24882@suse.de> <87wrztpgbh.fsf_-_@openvz.org> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII X-Virus-Checker-Version: clamassassin 1.2.4 with clamdscan / ClamAV 0.95.3/10272/Fri Jan 8 06:21:23 2010 signatures . Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1379 Lines: 42 On Fri, 8 Jan 2010, Dmitry Monakhov wrote: > > In fact inode_get_rsv_space() function is special in comparison > with inode_{add,sub,claim}_rsv_space() functions, because > it may return correct result even for fs without reserved space > support(correct val == 0). Add trivial check for that case. > The patch fix regression(BUG at fs/quota/dquot.c:1350) introduced > in following commit: fd8fbfc1709822bd94247c5b2ab15a5f5041e103 > > Signed-off-by: Dmitry Monakhov > --- > fs/quota/dquot.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c > index dea86ab..d9f06cf 100644 > --- a/fs/quota/dquot.c > +++ b/fs/quota/dquot.c > @@ -1377,6 +1377,8 @@ static void inode_sub_rsv_space(struct inode *inode, qsize_t number) > static qsize_t inode_get_rsv_space(struct inode *inode) > { > qsize_t ret; > + if (!inode->i_sb->dq_op->get_reserved_space) > + return 0; > spin_lock(&inode->i_lock); > ret = *inode_reserved_space(inode); > spin_unlock(&inode->i_lock); > Patch works for me on top of 2.6.33-rc3 and on top of 2.6.31.11. Thanks, Thomas -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/