Signed-off-by: Dmitry Monakhov <dmonakhov@xxxxxxxxxx> --- fs/quota/dquot.c | 12 ++++++++++++ fs/quota/quotaio_v2.h | 6 ++++-- include/linux/quota.h | 12 +++++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index de4b8fc..40075ea 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -1090,6 +1090,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 MGRQUOTA: + /* XXX: Currently there is no way to understand + which metagroup this task belonges to, So print + a warn message unconditionally. -dmon */ + return 1; } return 0; } @@ -1322,6 +1327,13 @@ int dquot_initialize(struct inode *inode, int type) case GRPQUOTA: id = inode->i_gid; break; + case MGRQUOTA: + if (inode->i_sb->s_aux_attr && + inode->i_sb->s_aux_attr->metagroup) + id = *inode->i_sb->s_aux_attr->metagroup(inode); + else + BUG_ON(sb_has_quota_loaded(inode->i_sb, MGRQUOTA)); + break; } got[cnt] = dqget(sb, id, cnt); } diff --git a/fs/quota/quotaio_v2.h b/fs/quota/quotaio_v2.h index f1966b4..c65c7fc 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 /* MRGQUOTA */\ } #define V2_INITQVERSIONS {\ 1, /* USRQUOTA */\ - 1 /* GRPQUOTA */\ + 1, /* GRPQUOTA */ \ + 1 /* MGRQUOTA */\ } /* First generic header */ diff --git a/include/linux/quota.h b/include/linux/quota.h index 680605d..a8f6cbe 100644 --- a/include/linux/quota.h +++ b/include/linux/quota.h @@ -36,18 +36,28 @@ #include <linux/errno.h> #include <linux/types.h> -#define __DQUOT_VERSION__ "dquot_6.5.2" +#define __DQUOT_VERSION__ "dquot_6.6.0" +#ifdef CONFIG_METAGROUP +#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_METAGROUP +#define MGRQUOTA 2 /* element used for metagroup quotas */ +#endif + /* * Definitions for the default names of the quotas files. */ #define INITQFNAMES { \ "user", /* USRQUOTA */ \ "group", /* GRPQUOTA */ \ + "metagroup", /* MGRQUOTA */ \ "undefined", \ }; -- 1.6.6 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html