From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Monakhov Subject: [PATCH 3/3] quota: add generic treeid quota support Date: Tue, 2 Feb 2010 18:00:25 +0300 Message-ID: <1265122826-5370-4-git-send-email-dmonakhov@openvz.org> References: <1265122826-5370-1-git-send-email-dmonakhov@openvz.org> <1265122826-5370-2-git-send-email-dmonakhov@openvz.org> <1265122826-5370-3-git-send-email-dmonakhov@openvz.org> Cc: jack@suse.cz, Dmitry Monakhov To: linux-fsdevel@vger.kernel.org Return-path: Received: from mailhub.sw.ru ([195.214.232.25]:24180 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754930Ab0BBPAi (ORCPT ); Tue, 2 Feb 2010 10:00:38 -0500 In-Reply-To: <1265122826-5370-3-git-send-email-dmonakhov@openvz.org> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Just introduce new and update macros. It will be used later. Signed-off-by: Dmitry Monakhov --- fs/quota/dquot.c | 5 +++++ fs/quota/quotaio_v2.h | 4 +++- include/linux/quota.h | 6 ++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 36569c9..9fbf301 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -1045,6 +1045,11 @@ static int need_print_warning(struct dquot *dquot) return current_fsuid() == dquot->dq_id; case GRPQUOTA: return in_group_p(dquot->dq_id); + case TRQUOTA: + /* XXX: Currently there is no way to understand + which tree this task belonges to, So print + a warn message unconditionally. -dmon */ + return 1; } return 0; } diff --git a/fs/quota/quotaio_v2.h b/fs/quota/quotaio_v2.h index f1966b4..ca6f1ff 100644 --- a/fs/quota/quotaio_v2.h +++ b/fs/quota/quotaio_v2.h @@ -13,12 +13,14 @@ */ #define V2_INITQMAGICS {\ 0xd9c01f11, /* USRQUOTA */\ - 0xd9c01927 /* GRPQUOTA */\ + 0xd9c01927, /* GRPQUOTA */\ + 0xd9c03f14 /* TRQUOTA */\ } #define V2_INITQVERSIONS {\ 1, /* USRQUOTA */\ 1 /* GRPQUOTA */\ + 1 /* TRPQUOTA */\ } /* First generic header */ diff --git a/include/linux/quota.h b/include/linux/quota.h index 7f06086..dc6d84e 100644 --- a/include/linux/quota.h +++ b/include/linux/quota.h @@ -36,11 +36,12 @@ #include #include -#define __DQUOT_VERSION__ "dquot_6.5.2" +#define __DQUOT_VERSION__ "dquot_7.0.0" -#define MAXQUOTAS 2 +#define MAXQUOTAS 3 #define USRQUOTA 0 /* element used for user quotas */ #define GRPQUOTA 1 /* element used for group quotas */ +#define TRQUOTA 2 /* element used for directory tree quotas */ /* * Definitions for the default names of the quotas files. @@ -48,6 +49,7 @@ #define INITQFNAMES { \ "user", /* USRQUOTA */ \ "group", /* GRPQUOTA */ \ + "tree", /* TRQUOTA */ \ "undefined", \ }; -- 1.6.3.3