From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id CFC6D7F51 for ; Wed, 25 Feb 2015 06:45:35 -0600 (CST) Received: from cuda.sgi.com (cuda2.sgi.com [192.48.176.25]) by relay3.corp.sgi.com (Postfix) with ESMTP id 4F81EAC002 for ; Wed, 25 Feb 2015 04:45:32 -0800 (PST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id IhisG7NXh1bOIzr4 (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Wed, 25 Feb 2015 04:45:27 -0800 (PST) Date: Wed, 25 Feb 2015 07:45:25 -0500 From: Brian Foster Subject: Re: [PATCH] xfs: Fix quota type in quota structures when reusing quota file Message-ID: <20150225124525.GA28053@bfoster.bfoster> References: <1424188630-1111-1-git-send-email-jack@suse.cz> <20150225104057.GA22736@quack.suse.cz> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20150225104057.GA22736@quack.suse.cz> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: Jan Kara Cc: Al Viro , xfs@oss.sgi.com On Wed, Feb 25, 2015 at 11:40:57AM +0100, Jan Kara wrote: > Ping? Can you guys please review / pick-up the fix? Thanks! > Looks like this is in Dave's tree: commit dfcc70a8c868fe03276fa59864149708fb41930b Author: Jan Kara Date: Mon Feb 23 22:34:17 2015 +1100 xfs: Fix quota type in quota structures when reusing quota file ... Brian > Honza > > On Tue 17-02-15 16:57:10, Jan Kara wrote: > > For filesystems without separate project quota inode field in the > > superblock we just reuse project quota file for group quotas (and vice > > versa) if project quota file is allocated and we need group quota file. > > When we reuse the file, quota structures on disk suddenly have wrong > > type stored in d_flags though. Nobody really cares about this (although > > structure type reported to userspace was wrong as well) except > > that after commit 14bf61ffe6ac (quota: Switch ->get_dqblk() and > > ->set_dqblk() to use bytes as space units) assertion in > > xfs_qm_scall_getquota() started to trigger on xfs/106 test (apparently I > > was testing without XFS_DEBUG so I didn't notice when submitting the > > above commit). > > > > Fix the problem by properly resetting ddq->d_flags when running quotacheck > > for a quota file. > > > > CC: stable@vger.kernel.org > > Reported-by: Al Viro > > Signed-off-by: Jan Kara > > --- > > fs/xfs/xfs_qm.c | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c > > index 3e8186279541..dd0dcc7b76cd 100644 > > --- a/fs/xfs/xfs_qm.c > > +++ b/fs/xfs/xfs_qm.c > > @@ -836,6 +836,11 @@ xfs_qm_reset_dqcounts( > > */ > > xfs_dqcheck(mp, ddq, id+j, type, XFS_QMOPT_DQREPAIR, > > "xfs_quotacheck"); > > + /* > > + * Reset type in case we are reusing group quota file for > > + * project quotas or vice versa > > + */ > > + ddq->d_flags = type; > > ddq->d_bcount = 0; > > ddq->d_icount = 0; > > ddq->d_rtbcount = 0; > > -- > > 2.1.4 > > > -- > Jan Kara > SUSE Labs, CR > > _______________________________________________ > xfs mailing list > xfs@oss.sgi.com > http://oss.sgi.com/mailman/listinfo/xfs _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs