From patchwork Thu Jun 21 09:08:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Monakhov X-Patchwork-Id: 166269 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 25AD2B6FA0 for ; Thu, 21 Jun 2012 19:09:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932299Ab2FUJJW (ORCPT ); Thu, 21 Jun 2012 05:09:22 -0400 Received: from mail-lb0-f174.google.com ([209.85.217.174]:46938 "EHLO mail-lb0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932271Ab2FUJJM (ORCPT ); Thu, 21 Jun 2012 05:09:12 -0400 Received: by mail-lb0-f174.google.com with SMTP id gm6so1820753lbb.19 for ; Thu, 21 Jun 2012 02:09:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=tb5Ja7aY0qonQ9dQnD08ajIKduKgWMXdaPpSIjfxB2s=; b=B1qOS1S2sMuism9BkloSVxD+YCn1x5B0kyTs/GquWAKN4D8tPXw58biV4Bam24aoI0 VXf9zKXp4HXEi1UG0LGlgdzvITWZCsn1L18YZKlmih8K4fqmZwbdFBH1TkNLZ1NFKioi 3wIdytSIbg+EOuXI8GvlWpdO4cZRNrHuFAJ5zc0iJXozJYSXUdAzh4YOVdI6dOZnDYzJ gXfaGWI4aglc/6tK4GnaI7xgTbsdfiqnzpVjIHIvoZx9tbK5IiICzj2MN15WzWbX7Eeo hpRd7dN3ydF2D6D09k2W0MLo0qT94XIPi7VbA9Lp8RGomJHvwr/K3PuWjNivZnQEGV6r SIeQ== Received: by 10.112.100.234 with SMTP id fb10mr11454614lbb.12.1340269751872; Thu, 21 Jun 2012 02:09:11 -0700 (PDT) Received: from localhost.localdomain (swsoft-msk-nat.sw.ru. [195.214.232.10]) by mx.google.com with ESMTPS id xx8sm44960572lab.10.2012.06.21.02.09.09 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 21 Jun 2012 02:09:10 -0700 (PDT) From: Dmitry Monakhov To: linux-ext4@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, Dmitry Monakhov Subject: [PATCH 5/5] XFS: prjquota and grpqouta now may coexist Date: Thu, 21 Jun 2012 13:08:53 +0400 Message-Id: <1340269733-25922-6-git-send-email-dmonakhov@openvz.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1340269733-25922-1-git-send-email-dmonakhov@openvz.org> References: <1340269733-25922-1-git-send-email-dmonakhov@openvz.org> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Signed-off-by: Dmitry Monakhov --- fs/xfs/xfs_super.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 0d9de41..f408a27 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -538,14 +538,14 @@ xfs_showargs( else if (mp->m_qflags & XFS_UQUOTA_ACCT) seq_puts(m, "," MNTOPT_UQUOTANOENF); - /* Either project or group quotas can be active, not both */ - if (mp->m_qflags & XFS_PQUOTA_ACCT) { if (mp->m_qflags & XFS_OQUOTA_ENFD) seq_puts(m, "," MNTOPT_PRJQUOTA); else seq_puts(m, "," MNTOPT_PQUOTANOENF); - } else if (mp->m_qflags & XFS_GQUOTA_ACCT) { + } + + if (mp->m_qflags & XFS_GQUOTA_ACCT) { if (mp->m_qflags & XFS_OQUOTA_ENFD) seq_puts(m, "," MNTOPT_GRPQUOTA); else