From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Monakhov Subject: [PATCH 2/4] quota: Implement project id support for generic quota Date: Fri, 29 Oct 2010 17:03:38 +0400 Message-ID: <1288357420-7178-3-git-send-email-dmonakhov@openvz.org> References: <1288357420-7178-1-git-send-email-dmonakhov@openvz.org> Cc: viro@ZenIV.linux.org.uk, jack@suse.cz, linux-ext4@vger.kernel.org, Dmitry Monakhov To: linux-fsdevel@vger.kernel.org Return-path: In-Reply-To: <1288357420-7178-1-git-send-email-dmonakhov@openvz.org> Sender: linux-ext4-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Since all preparation code are already in quota-tree, So this patch is really small. Signed-off-by: Dmitry Monakhov --- fs/quota/dquot.c | 10 ++++++++++ fs/quota/quotaio_v2.h | 6 ++++-- include/linux/quota.h | 12 +++++++++++- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 0fed41e..f6e01cf 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -1128,6 +1128,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 PRJQUOTA: + /* XXX: Currently there is no way to understand + which project_id this task belonges to, So print + a warn message unconditionally. -dmon */ + return 1; } return 0; } @@ -1373,6 +1378,11 @@ static void __dquot_initialize(struct inode *inode, int type) case GRPQUOTA: id = inode->i_gid; break; + case PRJQUOTA: + if (!inode->i_sb->s_op->get_prjid) + continue; + id = inode->i_sb->s_op->get_prjid(inode); + break; } got[cnt] = dqget(sb, id, cnt); } diff --git a/fs/quota/quotaio_v2.h b/fs/quota/quotaio_v2.h index f1966b4..bfab9df 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 /* PRJQUOTA */\ } #define V2_INITQVERSIONS {\ 1, /* USRQUOTA */\ - 1 /* GRPQUOTA */\ + 1, /* GRPQUOTA */ \ + 1 /* PRJQUOTA */\ } /* First generic header */ diff --git a/include/linux/quota.h b/include/linux/quota.h index 94c1f03..0b5638f 100644 --- a/include/linux/quota.h +++ b/include/linux/quota.h @@ -36,18 +36,28 @@ #include #include -#define __DQUOT_VERSION__ "dquot_6.5.2" +#define __DQUOT_VERSION__ "dquot_6.6.0" +#ifdef CONFIG_PROJECT_ID +#define MAXQUOTAS 3 +#else #define MAXQUOTAS 2 +#endif + #define USRQUOTA 0 /* element used for user quotas */ #define GRPQUOTA 1 /* element used for group quotas */ +#ifdef CONFIG_PROJECT_ID +#define PRJQUOTA 2 /* element used for project quotas */ +#endif + /* * Definitions for the default names of the quotas files. */ #define INITQFNAMES { \ "user", /* USRQUOTA */ \ "group", /* GRPQUOTA */ \ + "project", /* RPJQUOTA */ \ "undefined", \ }; -- 1.6.5.2