From patchwork Mon Jul 9 15:28:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Monakhov X-Patchwork-Id: 169880 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 7D1012C0205 for ; Tue, 10 Jul 2012 01:29:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751657Ab2GIP3R (ORCPT ); Mon, 9 Jul 2012 11:29:17 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:46996 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750716Ab2GIP27 (ORCPT ); Mon, 9 Jul 2012 11:28:59 -0400 Received: by bkwj10 with SMTP id j10so6096535bkw.19 for ; Mon, 09 Jul 2012 08:28:58 -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=oIORqclkXh12PAJ6tOXTJBo8dsaasKYFcn3q+7yBcAQ=; b=oCDtrdPegydeRJ4LkG/ktL8jQjzmocet/ClbIjDJ1c46+dWFeGZ1LgxFndJUeyqF0E E+B/tbiRqJWY05RRGrBJGbgIN3fFwGRMBO364cjWpBvAWdGeipn44cNTMwdzNfTNP9xT Efa0MheUMhEziXWKdfUvIyNUsADLNrWBlNLYtFi1wP8+zC3wyJzTranjEf246V4VMrO6 kxC9xBUw7VHU3m8FhoE0tnI487Wl6+ltQ7336RVe1TjLscZT7Ud6KgOH8BDte/UN4c+k Jj4ZAYobZwVph0WQOubz37NmaldoATWrBhubU4x4wMxMkvURjGJ7+lW5jqGCA9w3EXMo maiw== Received: by 10.152.127.98 with SMTP id nf2mr5235421lab.4.1341847738189; Mon, 09 Jul 2012 08:28:58 -0700 (PDT) Received: from localhost.localdomain (swsoft-msk-nat.sw.ru. [195.214.232.10]) by mx.google.com with ESMTPS id pi5sm47637470lab.7.2012.07.09.08.28.55 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 Jul 2012 08:28:57 -0700 (PDT) From: Dmitry Monakhov To: linux-ext4@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: jack@suse.cz, Dmitry Monakhov Subject: [PATCH 3/3] ext4: add subtree quota support Date: Mon, 9 Jul 2012 19:28:45 +0400 Message-Id: <1341847725-26114-4-git-send-email-dmonakhov@openvz.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1341847725-26114-1-git-send-email-dmonakhov@openvz.org> References: <1341847725-26114-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 From: Dmitry Monakhov Both regular and journaled quota are supported. Signed-off-by: Dmitry Monakhov --- fs/ext4/ext4.h | 1 + fs/ext4/super.c | 49 ++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index f831210..ff41db8 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -955,6 +955,7 @@ struct ext4_inode_info { #define EXT4_MOUNT_ERRORS_MASK 0x00070 #define EXT4_MOUNT_MINIX_DF 0x00080 /* Mimics the Minix statfs */ #define EXT4_MOUNT_NOLOAD 0x00100 /* Don't use existing journal*/ +#define EXT4_MOUNT_SBTRQUOTA 0x00200 /* Subtree 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 3599c95..6f5c1a7 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1128,8 +1128,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); @@ -1229,10 +1229,11 @@ enum { Opt_journal_dev, 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_sbtrjquota, + Opt_offusrjquota, Opt_offgrpjquota, Opt_offsbtrjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, Opt_noquota, Opt_barrier, Opt_nobarrier, Opt_err, - Opt_usrquota, Opt_grpquota, Opt_i_version, + Opt_usrquota, Opt_grpquota, Opt_sbtrquota, Opt_i_version, Opt_stripe, Opt_delalloc, Opt_nodelalloc, Opt_mblk_io_submit, Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity, Opt_inode_readahead_blks, Opt_journal_ioprio, @@ -1281,10 +1282,13 @@ static const match_table_t tokens = { {Opt_usrjquota, "usrjquota=%s"}, {Opt_offgrpjquota, "grpjquota="}, {Opt_grpjquota, "grpjquota=%s"}, + {Opt_offsbtrjquota, "sbtrjquota="}, + {Opt_sbtrjquota, "sbtrjquota=%s"}, {Opt_jqfmt_vfsold, "jqfmt=vfsold"}, {Opt_jqfmt_vfsv0, "jqfmt=vfsv0"}, {Opt_jqfmt_vfsv1, "jqfmt=vfsv1"}, {Opt_grpquota, "grpquota"}, + {Opt_sbtrquota, "sbtrquota"}, {Opt_noquota, "noquota"}, {Opt_quota, "quota"}, {Opt_usrquota, "usrquota"}, @@ -1486,11 +1490,19 @@ static const struct mount_opts { EXT4_MOUNT_GRPQUOTA), MOPT_CLEAR | MOPT_Q}, {Opt_usrjquota, 0, MOPT_Q}, {Opt_grpjquota, 0, MOPT_Q}, + {Opt_sbtrjquota, 0, MOPT_Q}, {Opt_offusrjquota, 0, MOPT_Q}, {Opt_offgrpjquota, 0, MOPT_Q}, + {Opt_offsbtrjquota, 0, MOPT_Q}, {Opt_jqfmt_vfsold, QFMT_VFS_OLD, MOPT_QFMT}, {Opt_jqfmt_vfsv0, QFMT_VFS_V0, MOPT_QFMT}, {Opt_jqfmt_vfsv1, QFMT_VFS_V1, MOPT_QFMT}, +#ifdef CONFIG_EXT4_SUBTREE + {Opt_sbtrquota, EXT4_MOUNT_QUOTA | EXT4_MOUNT_SBTRQUOTA, (MOPT_SET | + MOPT_Q)}, +#else + {Opt_sbtrquota, 0, MOPT_NOSUPPORT}, +#endif {Opt_err, 0, 0} }; @@ -1513,6 +1525,17 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token, return clear_qf_name(sb, USRQUOTA); else if (token == Opt_offgrpjquota) return clear_qf_name(sb, GRPQUOTA); +#ifdef CONFIG_SUBTREE + else if (token == Opt_sbtrjquota) + return set_qf_name(sb, SBTRQUOTA, &args[0]); + else if (token == Opt_offsbtrjquota) + return clear_qf_name(sb, SBTRQUOTA); +#else + else if (token == Opt_sbtrjquota || token == Opt_offsbtrjquota) { + ext4_msg(sb, KERN_ERR, "subtree quota options not supported"); + return 0; + } +#endif #endif if (args->from && match_int(args, &arg)) return -1; @@ -1685,13 +1708,17 @@ static int parse_options(char *options, struct super_block *sb, return 0; } #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[SBTRQUOTA]) { if (test_opt(sb, USRQUOTA) && sbi->s_qf_names[USRQUOTA]) clear_opt(sb, USRQUOTA); if (test_opt(sb, GRPQUOTA) && sbi->s_qf_names[GRPQUOTA]) clear_opt(sb, GRPQUOTA); + if (test_opt(sb, SBTRQUOTA) && sbi->s_qf_names[SBTRQUOTA]) + clear_opt(sb, SBTRQUOTA); + if (test_opt(sb, GRPQUOTA) || test_opt(sb, USRQUOTA)) { ext4_msg(sb, KERN_ERR, "old and new quota " "format mixing"); @@ -1743,12 +1770,19 @@ 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]); - +#ifdef CONFIG_EXT4_SUBTREE + if (sbi->s_qf_names[SBTRQUOTA]) + seq_printf(seq, ",sbtrjquota=%s", sbi->s_qf_names[SBTRQUOTA]); +#endif if (test_opt(sb, USRQUOTA)) seq_puts(seq, ",usrquota"); if (test_opt(sb, GRPQUOTA)) seq_puts(seq, ",grpquota"); + + if (test_opt(sb, SBTRQUOTA)) + seq_puts(seq, ",sbtrquota"); + #endif } @@ -4762,7 +4796,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[SBTRQUOTA]) { dquot_mark_dquot_dirty(dquot); return ext4_write_dquot(dquot); } else {