From: Aditya Kali Subject: Re: [PATCH 2/9] quota: fix e2fsck so we update the quota file correctly Date: Mon, 12 May 2014 23:35:20 -0700 Message-ID: References: <1399782773-20029-1-git-send-email-tytso@mit.edu> <1399782773-20029-3-git-send-email-tytso@mit.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Cc: Ext4 Developers List To: "Theodore Ts'o" Return-path: Received: from mail-oa0-f47.google.com ([209.85.219.47]:36707 "EHLO mail-oa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753164AbaEMGfl (ORCPT ); Tue, 13 May 2014 02:35:41 -0400 Received: by mail-oa0-f47.google.com with SMTP id i7so9476523oag.6 for ; Mon, 12 May 2014 23:35:40 -0700 (PDT) In-Reply-To: <1399782773-20029-3-git-send-email-tytso@mit.edu> Sender: linux-ext4-owner@vger.kernel.org List-ID: Looks good. On Sat, May 10, 2014 at 9:32 PM, Theodore Ts'o wrote: > In scan_dquota_callback() we were copying dqb_off from the on-disk > dquot structure to the dqot structure that we have constructed in > memory. This is a bad idea, because if we detect that the quota inode > is corrupted and needs to be replaced, when we later write out the > inode, the fact that we have a non-zero dqb_off value means that quota > routines will not bother updating the quota tree index, since > presumably the quota tree index already has an entry for this dqot. > > The problem is that e2fsck, the only user of these functions, has > zapped the quota inode so it can be written from scratch. So this > means the index for the quota records are not written out, so the > kernel can not find any of the records in the quota inodes. Oops. > > The fix is simple; there is no reason to copy the dqb_off field into > the quota_dict copy of struct dquot. > > Signed-off-by: "Theodore Ts'o" > Cc: adityakali@google.com Reviewed-by: Aditya Kali Thanks! > --- > lib/quota/mkquota.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/lib/quota/mkquota.c b/lib/quota/mkquota.c > index 3849ae1..f77e072 100644 > --- a/lib/quota/mkquota.c > +++ b/lib/quota/mkquota.c > @@ -458,7 +458,6 @@ static int scan_dquots_callback(struct dquot *dquot, void *cb_data) > > dq = get_dq(quota_dict, dquot->dq_id); > dq->dq_id = dquot->dq_id; > - dq->dq_dqb.u.v2_mdqb.dqb_off = dquot->dq_dqb.u.v2_mdqb.dqb_off; > > print_dquot("mem", dq); > print_dquot("dsk", dquot); > -- > 1.9.0 > -- Aditya