From patchwork Tue May 22 02:09:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 160524 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AF7BAB6F77 for ; Tue, 22 May 2012 12:09:39 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754086Ab2EVCJi (ORCPT ); Mon, 21 May 2012 22:09:38 -0400 Received: from li9-11.members.linode.com ([67.18.176.11]:56094 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750896Ab2EVCJh (ORCPT ); Mon, 21 May 2012 22:09:37 -0400 Received: from root (helo=tytso-glaptop.cam.corp.google.com) by imap.thunk.org with local-esmtp (Exim 4.72) (envelope-from ) id 1SWeXZ-0005Xg-Bx; Tue, 22 May 2012 02:09:37 +0000 Received: from tytso by tytso-glaptop.cam.corp.google.com with local (Exim 4.71) (envelope-from ) id 1SWeXX-0001rb-03; Mon, 21 May 2012 22:09:35 -0400 From: Theodore Ts'o To: Ext4 Developers List Cc: Theodore Ts'o , Aditya Kali Subject: [PATCH] e2fsck: fix precedence bug in built-in quota support Date: Mon, 21 May 2012 22:09:34 -0400 Message-Id: <1337652574-7132-1-git-send-email-tytso@mit.edu> X-Mailer: git-send-email 1.7.10.rc3 X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org The operator precedence bug means that we might pay atteion to s_grp_quota_inum even if the RO_COMPAT_QUOTA feature flag is clear. However, fortunately, this is unlikely to happen in practice. Cc: Aditya Kali Signed-off-by: "Theodore Ts'o" --- e2fsck/pass1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c index c7645d1..c6aae6e 100644 --- a/e2fsck/pass1.c +++ b/e2fsck/pass1.c @@ -928,8 +928,8 @@ void e2fsck_pass1(e2fsck_t ctx) ext2fs_mark_inode_bitmap2(ctx->inode_used_map, ino); if ((fs->super->s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_QUOTA) && - (fs->super->s_usr_quota_inum == ino) || - (fs->super->s_grp_quota_inum == ino)) { + ((fs->super->s_usr_quota_inum == ino) || + (fs->super->s_grp_quota_inum == ino))) { if (!LINUX_S_ISREG(inode->i_mode) && fix_problem(ctx, PR_1_QUOTA_BAD_MODE, &pctx)) {