From patchwork Fri Oct 29 13:03:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Monakhov X-Patchwork-Id: 69582 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 CEAC1B70E0 for ; Sat, 30 Oct 2010 00:04:09 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932586Ab0J2NEF (ORCPT ); Fri, 29 Oct 2010 09:04:05 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:61064 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932671Ab0J2NEB (ORCPT ); Fri, 29 Oct 2010 09:04:01 -0400 Received: by mail-ey0-f174.google.com with SMTP id 27so2081912eye.19 for ; Fri, 29 Oct 2010 06:04:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references; bh=xcNXfsngJIx3kuofqL81dLYhHA199SiWMB7omOzmcM0=; b=rHswiNf+Iq1Xx3HLGvA+K7UktKPg2AvUdHCdEsLvbIK8/CfXsmTb6lgU/UQ7ikc174 ECZbDcuSJ7P9WgsFdp3Ysi9fj3daWBnu6O+UcHiY4/qbe2mCOOm3qB1gW7b9rtPjckQI p2I7gEDb2iHcoyLibm8nCmXkbTM/SYeh5m43E= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=Muk50KDmez7CfbxTEO7fwEsVrDXIlgFGFeecUUOS44C3j0JYKHmpj3SvM97RRgRdWl D7nEueoM3fGLar0+isUH4wkerwXiGXacSie4Wo3sTm0b9e7lUGc7SCvNkKW9ZCRXHYLQ e4/ZMNR0x3KYMIXwt5lIoxUlEVO8hZRezT7m4= Received: by 10.14.47.78 with SMTP id s54mr9890966eeb.21.1288357440054; Fri, 29 Oct 2010 06:04:00 -0700 (PDT) Received: from localhost.localdomain (swsoft-msk-nat.sw.ru [195.214.232.10]) by mx.google.com with ESMTPS id x54sm1686102eeh.23.2010.10.29.06.03.58 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 29 Oct 2010 06:03:59 -0700 (PDT) From: Dmitry Monakhov To: linux-fsdevel@vger.kernel.org Cc: viro@ZenIV.linux.org.uk, jack@suse.cz, linux-ext4@vger.kernel.org, Dmitry Monakhov Subject: [PATCH 4/4] ext4: add project quota support Date: Fri, 29 Oct 2010 17:03:40 +0400 Message-Id: <1288357420-7178-5-git-send-email-dmonakhov@openvz.org> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1288357420-7178-1-git-send-email-dmonakhov@openvz.org> References: <1288357420-7178-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 Both regular and journaled quota are supported. Signed-off-by: Dmitry Monakhov --- fs/ext4/ext4.h | 1 + fs/ext4/super.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 58 insertions(+), 8 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 0547875..0cd6039 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -893,6 +893,7 @@ struct ext4_inode_info { #define EXT4_MOUNT_ERRORS_PANIC 0x00040 /* Panic on errors */ #define EXT4_MOUNT_MINIX_DF 0x00080 /* Mimics the Minix statfs */ #define EXT4_MOUNT_NOLOAD 0x00100 /* Don't use existing journal*/ +#define EXT4_MOUNT_PRJQUOTA 0x00200 /* Project quota support */ #define EXT4_MOUNT_DATA_FLAGS 0x00C00 /* Mode for data writes: */ #define EXT4_MOUNT_JOURNAL_DATA 0x00400 /* Write data to journal */ #define EXT4_MOUNT_ORDERED_DATA 0x00800 /* Flush data before commit */ diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 5abc609..51b84e5 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -917,11 +917,18 @@ static inline void ext4_show_quota_options(struct seq_file *seq, if (sbi->s_qf_names[GRPQUOTA]) seq_printf(seq, ",grpjquota=%s", sbi->s_qf_names[GRPQUOTA]); + if (sbi->s_qf_names[PRJQUOTA]) + seq_printf(seq, ",prjjquota=%s", sbi->s_qf_names[PRJQUOTA]); + if (test_opt(sb, USRQUOTA)) seq_puts(seq, ",usrquota"); if (test_opt(sb, GRPQUOTA)) seq_puts(seq, ",grpquota"); + + if (test_opt(sb, PRJQUOTA)) + seq_puts(seq, ",prjquota"); + #endif } @@ -1132,8 +1139,8 @@ static int bdev_try_to_free_page(struct super_block *sb, struct page *page, } #ifdef CONFIG_QUOTA -#define QTYPE2NAME(t) ((t) == USRQUOTA ? "user" : "group") -#define QTYPE2MOPT(on, t) ((t) == USRQUOTA?((on)##USRJQUOTA):((on)##GRPJQUOTA)) +static char *quotatypes[] = INITQFNAMES; +#define QTYPE2NAME(t) (quotatypes[t]) static int ext4_write_dquot(struct dquot *dquot); static int ext4_acquire_dquot(struct dquot *dquot); @@ -1235,10 +1242,11 @@ enum { Opt_journal_checksum, Opt_journal_async_commit, Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback, Opt_data_err_abort, Opt_data_err_ignore, - Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, + Opt_usrjquota, Opt_grpjquota, Opt_prjjquota, Opt_offusrjquota, + Opt_offgrpjquota, Opt_offprjjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err, - Opt_resize, Opt_usrquota, Opt_grpquota, Opt_i_version, + Opt_resize, Opt_usrquota, Opt_grpquota, Opt_prjquota, Opt_i_version, Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_block_validity, Opt_noblock_validity, Opt_inode_readahead_blks, Opt_journal_ioprio, @@ -1289,10 +1297,13 @@ static const match_table_t tokens = { {Opt_usrjquota, "usrjquota=%s"}, {Opt_offgrpjquota, "grpjquota="}, {Opt_grpjquota, "grpjquota=%s"}, + {Opt_offprjjquota, "prjjquota="}, + {Opt_prjjquota, "prjjquota=%s"}, {Opt_jqfmt_vfsold, "jqfmt=vfsold"}, {Opt_jqfmt_vfsv0, "jqfmt=vfsv0"}, {Opt_jqfmt_vfsv1, "jqfmt=vfsv1"}, {Opt_grpquota, "grpquota"}, + {Opt_prjquota, "prjquota"}, {Opt_noquota, "noquota"}, {Opt_quota, "quota"}, {Opt_usrquota, "usrquota"}, @@ -1615,6 +1626,16 @@ static int parse_options(char *options, struct super_block *sb, if (!set_qf_name(sb, GRPQUOTA, &args[0])) return 0; break; + + case Opt_prjjquota: +#ifdef CONFIG_PROJECT_ID + if (!set_qf_name(sb, PRJQUOTA, &args[0])) + return 0; +#else + ext4_msg(sb, KERN_ERR, + "project quota options not supported"); +#endif + break; case Opt_offusrjquota: if (!clear_qf_name(sb, USRQUOTA)) return 0; @@ -1623,7 +1644,15 @@ static int parse_options(char *options, struct super_block *sb, if (!clear_qf_name(sb, GRPQUOTA)) return 0; break; - + case Opt_offprjjquota: +#ifdef CONFIG_PROJECT_ID + if (!clear_qf_name(sb, PRJQUOTA)) + return 0; +#else + ext4_msg(sb, KERN_ERR, + "project quota options not supported"); +#endif + break; case Opt_jqfmt_vfsold: qfmt = QFMT_VFS_OLD; goto set_qf_format; @@ -1651,6 +1680,16 @@ set_qf_format: set_opt(sbi->s_mount_opt, QUOTA); set_opt(sbi->s_mount_opt, GRPQUOTA); break; + case Opt_prjquota: +#ifdef CONFIG_PROJECT_ID + set_opt(sbi->s_mount_opt, PROJECT_ID); + set_opt(sbi->s_mount_opt, QUOTA); + set_opt(sbi->s_mount_opt, PRJQUOTA); +#else + ext4_msg(sb, KERN_ERR, + "project quota options not supported"); +#endif + break; case Opt_noquota: if (sb_any_quota_loaded(sb)) { ext4_msg(sb, KERN_ERR, "Cannot change quota " @@ -1660,18 +1699,22 @@ set_qf_format: clear_opt(sbi->s_mount_opt, QUOTA); clear_opt(sbi->s_mount_opt, USRQUOTA); clear_opt(sbi->s_mount_opt, GRPQUOTA); + clear_opt(sbi->s_mount_opt, PRJQUOTA); break; #else case Opt_quota: case Opt_usrquota: case Opt_grpquota: + case Opt_prjquota: ext4_msg(sb, KERN_ERR, "quota options not supported"); break; case Opt_usrjquota: case Opt_grpjquota: + case Opt_prjjquota: case Opt_offusrjquota: case Opt_offgrpjquota: + case Opt_offprjjquota: case Opt_jqfmt_vfsold: case Opt_jqfmt_vfsv0: case Opt_jqfmt_vfsv1: @@ -1814,14 +1857,19 @@ set_qf_format: } } #ifdef CONFIG_QUOTA - if (sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) { + if (sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA] || + sbi->s_qf_names[PRJQUOTA]) { if (test_opt(sb, USRQUOTA) && sbi->s_qf_names[USRQUOTA]) clear_opt(sbi->s_mount_opt, USRQUOTA); if (test_opt(sb, GRPQUOTA) && sbi->s_qf_names[GRPQUOTA]) clear_opt(sbi->s_mount_opt, GRPQUOTA); - if (test_opt(sb, GRPQUOTA) || test_opt(sb, USRQUOTA)) { + if (test_opt(sb, PRJQUOTA) && sbi->s_qf_names[PRJQUOTA]) + clear_opt(sbi->s_mount_opt, PRJQUOTA); + + if (test_opt(sb, GRPQUOTA) || test_opt(sb, USRQUOTA) || + test_opt(sb, PRJQUOTA)) { ext4_msg(sb, KERN_ERR, "old and new quota " "format mixing"); return 0; @@ -4486,7 +4534,8 @@ static int ext4_mark_dquot_dirty(struct dquot *dquot) { /* Are we journaling quotas? */ if (EXT4_SB(dquot->dq_sb)->s_qf_names[USRQUOTA] || - EXT4_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA]) { + EXT4_SB(dquot->dq_sb)->s_qf_names[GRPQUOTA] || + EXT4_SB(dquot->dq_sb)->s_qf_names[PRJQUOTA]) { dquot_mark_dquot_dirty(dquot); return ext4_write_dquot(dquot); } else {