* [PATCH 1/6] RFC: introduce extended inode owner identifier v8
@ 2011-10-02 19:44 Dmitry Monakhov
2011-10-02 19:44 ` [PATCH 2/6] Add additional owner identifier Dmitry Monakhov
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Dmitry Monakhov @ 2011-10-02 19:44 UTC (permalink / raw)
To: linux-fsdevel; +Cc: linux-ext4, jack, viro, adityakali, Dmitry Monakhov
Hi, I've updated old standing project quota id patch-set.
Please take a look at it and replay me your opinion, especially if you
do not like it by some reason :) This is really important because i do
want this feature to be merged sooner or later.
*Feature description*
1) Inode may has a project identifier which has same meaning as uid/gid.
2) Id is stored in inode's xattr named "system.project_id"
3) Id is inherent from parent inode on creation.
4) This id is cached in memory fs_inode structure and may be accessible
via s_op->get_prjid(). This field it restricted by CONFIG_PROJECT_ID.
So no wasting of memory happens.
5) Since id is cached in memory it may be used for different purposes
such as:
5A) Implement additional quota id space orthogonal to uid/gid. This is
useful in managing quota for some filesystem hierarchy(chroot or
container over bindmount)
*User interface *
Project id is managed via generic xattr interface "system.project_id"
This good because
1) We may use already existing interface.
2) xattr already supported by generic utilities tar/rsync and etc
PATCH SET TOC:
1) generic projectid support
2) generic project quota support
3) ext4: small mount flags cleanup
4) ext4 project support implementation
4A) ext4: generic project support
4B) ext4: project quota support
Patch against 3.1.0-rc8-next-20110930
Actually vfs part is really small, and most changes happen in ext4-tree
Changes against V7
- Small fix for project switch error path
- Remove usless macro expressions
Changes against v6
- get rid of iattr stuff, current __dquot_transfer() provides sane interface
for quota manipulation. i_prjid can must be changed only by fs-speciffic
methods so only get() method is really necessery.
- remove #ifdef tricks from generic code.
- move i_prjid from vfs_inode to fs_inode, to prevent inode bloating.
- get rid of isolation logic, because this feature confuse most users.
Changes against v5
- convert dquota_transfer to struct iattr interface. Not it is possible
to change i_prjid via notify_changes()
- some bugfixes.
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/6] Add additional owner identifier
2011-10-02 19:44 [PATCH 1/6] RFC: introduce extended inode owner identifier v8 Dmitry Monakhov
@ 2011-10-02 19:44 ` Dmitry Monakhov
2011-10-02 19:44 ` [PATCH 3/6] Implement project id support for generic quota Dmitry Monakhov
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Monakhov @ 2011-10-02 19:44 UTC (permalink / raw)
To: linux-fsdevel; +Cc: linux-ext4, jack, viro, adityakali, Dmitry Monakhov
This patch add project inode identifier. Project ID may be used as
auxiliary owner specifier in addition to standard uid/gid.
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
---
fs/Kconfig | 7 +++++++
include/linux/fs.h | 1 +
include/linux/xattr.h | 3 +++
3 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/fs/Kconfig b/fs/Kconfig
index 5f4c45d..f3f1b12 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -56,6 +56,13 @@ config FILE_LOCKING
This option enables standard file locking support, required
for filesystems like NFS and for the flock() system
call. Disabling this option saves about 11k.
+config PROJECT_ID
+ bool "Enable project inode identifier"
+ default y
+ help
+ This option enables project inode identifier. Project ID
+ may be used as auxiliary owner specifier in addition to
+ standard uid/gid.
source "fs/notify/Kconfig"
diff --git a/include/linux/fs.h b/include/linux/fs.h
index e7b118c..9059ad4 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1670,6 +1670,7 @@ struct super_operations {
int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
int (*nr_cached_objects)(struct super_block *);
void (*free_cached_objects)(struct super_block *, int);
+ u32 (*get_prjid)(const struct inode *inode);
};
/*
diff --git a/include/linux/xattr.h b/include/linux/xattr.h
index e5d1220..f8a83c3 100644
--- a/include/linux/xattr.h
+++ b/include/linux/xattr.h
@@ -61,6 +61,9 @@
#include <linux/types.h>
+#define XATTR_PRJID "system.project_id"
+#define XATTR_PRJID_LEN (sizeof (XATTR_PRJID))
+
struct inode;
struct dentry;
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/6] Implement project id support for generic quota
2011-10-02 19:44 [PATCH 1/6] RFC: introduce extended inode owner identifier v8 Dmitry Monakhov
2011-10-02 19:44 ` [PATCH 2/6] Add additional owner identifier Dmitry Monakhov
@ 2011-10-02 19:44 ` Dmitry Monakhov
2011-10-02 19:44 ` [PATCH 4/6] ext4: get rid of didicated MOUNT_QUOTA option Dmitry Monakhov
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Monakhov @ 2011-10-02 19:44 UTC (permalink / raw)
To: linux-fsdevel; +Cc: linux-ext4, jack, viro, adityakali, Dmitry Monakhov
Since all preparation code are already in quota-tree,
So this patch is really small.
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
---
fs/quota/dquot.c | 10 ++++++++++
fs/quota/quotaio_v2.h | 6 ++++--
include/linux/quota.h | 9 ++++++++-
3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c
index 5b572c8..aca0430 100644
--- a/fs/quota/dquot.c
+++ b/fs/quota/dquot.c
@@ -1135,6 +1135,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;
}
@@ -1380,6 +1385,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 cb78556..f8696cd 100644
--- a/include/linux/quota.h
+++ b/include/linux/quota.h
@@ -36,11 +36,17 @@
#include <linux/errno.h>
#include <linux/types.h>
-#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 */
+#define PRJQUOTA 2 /* element used for project quotas */
/*
* Definitions for the default names of the quotas files.
@@ -48,6 +54,7 @@
#define INITQFNAMES { \
"user", /* USRQUOTA */ \
"group", /* GRPQUOTA */ \
+ "project", /* RPJQUOTA */ \
"undefined", \
};
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/6] ext4: get rid of didicated MOUNT_QUOTA option
2011-10-02 19:44 [PATCH 1/6] RFC: introduce extended inode owner identifier v8 Dmitry Monakhov
2011-10-02 19:44 ` [PATCH 2/6] Add additional owner identifier Dmitry Monakhov
2011-10-02 19:44 ` [PATCH 3/6] Implement project id support for generic quota Dmitry Monakhov
@ 2011-10-02 19:44 ` Dmitry Monakhov
2011-10-02 19:44 ` [PATCH 5/6] ext4: Implement project ID support for ext4 filesystem Dmitry Monakhov
2011-10-02 19:44 ` [PATCH 6/6] ext4: add project quota support Dmitry Monakhov
4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Monakhov @ 2011-10-02 19:44 UTC (permalink / raw)
To: linux-fsdevel; +Cc: linux-ext4, jack, viro, adityakali, Dmitry Monakhov
Currently didicated quota option is used only for options parsing phase,
which is very inefficient. Also show_opts output are not obvious in case
of journaled quota.
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
---
fs/ext4/ext4.h | 2 +-
fs/ext4/super.c | 16 +++++++---------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 9eedecb..e92c51a 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -904,9 +904,9 @@ struct ext4_inode_info {
#define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */
#define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */
#define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */
-#define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */
#define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
#define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
+#define EXT4_MOUNT_QUOTA 0x300000 /* Some quota option set */
#define EXT4_MOUNT_DIOREAD_NOLOCK 0x400000 /* Enable support for dio read nolocking */
#define EXT4_MOUNT_JOURNAL_CHECKSUM 0x800000 /* Journal checksums */
#define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 44d0c8d..74d2726 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1459,7 +1459,6 @@ static int set_qf_name(struct super_block *sb, int qtype, substring_t *args)
sbi->s_qf_names[qtype] = NULL;
return 0;
}
- set_opt(sb, QUOTA);
return 1;
}
@@ -1694,10 +1693,12 @@ static int parse_options(char *options, struct super_block *sb,
case Opt_offusrjquota:
if (!clear_qf_name(sb, USRQUOTA))
return 0;
+ clear_opt(sb, USRQUOTA);
break;
case Opt_offgrpjquota:
if (!clear_qf_name(sb, GRPQUOTA))
return 0;
+ clear_opt(sb, USRQUOTA);
break;
case Opt_jqfmt_vfsold:
@@ -1720,11 +1721,9 @@ set_qf_format:
break;
case Opt_quota:
case Opt_usrquota:
- set_opt(sb, QUOTA);
set_opt(sb, USRQUOTA);
break;
case Opt_grpquota:
- set_opt(sb, QUOTA);
set_opt(sb, GRPQUOTA);
break;
case Opt_noquota:
@@ -1734,8 +1733,6 @@ set_qf_format:
return 0;
}
clear_opt(sb, QUOTA);
- clear_opt(sb, USRQUOTA);
- clear_opt(sb, GRPQUOTA);
break;
#else
case Opt_quota:
@@ -1894,23 +1891,24 @@ set_qf_format:
}
#ifdef CONFIG_QUOTA
if (sbi->s_qf_names[USRQUOTA] || sbi->s_qf_names[GRPQUOTA]) {
+ int jquota = 0;
if (test_opt(sb, USRQUOTA) && sbi->s_qf_names[USRQUOTA])
- clear_opt(sb, USRQUOTA);
+ jquota |= EXT4_MOUNT_USRQUOTA;
if (test_opt(sb, GRPQUOTA) && sbi->s_qf_names[GRPQUOTA])
- clear_opt(sb, GRPQUOTA);
+ jquota |= EXT4_MOUNT_GRPQUOTA;
- if (test_opt(sb, GRPQUOTA) || test_opt(sb, USRQUOTA)) {
+ if (test_opt(sb, QUOTA) != jquota) {
ext4_msg(sb, KERN_ERR, "old and new quota "
"format mixing");
return 0;
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 5/6] ext4: Implement project ID support for ext4 filesystem
2011-10-02 19:44 [PATCH 1/6] RFC: introduce extended inode owner identifier v8 Dmitry Monakhov
` (2 preceding siblings ...)
2011-10-02 19:44 ` [PATCH 4/6] ext4: get rid of didicated MOUNT_QUOTA option Dmitry Monakhov
@ 2011-10-02 19:44 ` Dmitry Monakhov
2011-10-02 19:44 ` [PATCH 6/6] ext4: add project quota support Dmitry Monakhov
4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Monakhov @ 2011-10-02 19:44 UTC (permalink / raw)
To: linux-fsdevel; +Cc: linux-ext4, jack, viro, adityakali, Dmitry Monakhov
* Abstract
A subtree of a directory tree T is a tree consisting of a directory
(the subtree root) in T and all of its descendants in T.
*NOTE*: User is allowed to break pure subtree hierarchy via manual
id manipulation.
Project subtrees assumptions:
(1) Each inode has an id. This id is persistently stored inside
inode (xattr, usually inside ibody)
(2) Project id is inherent from parent directory
This feature is similar to project-id in XFS. One may assign some id to
a subtree. Each entry from the subtree may be accounted in directory
project quota. Will appear in later patches.
* Disk layout
Project id is stored on disk inside xattr usually inside ibody.
Xattr is used only as a data storage, It has not user visible xattr
interface.
* User interface
Project id is accessible via generic xattr interface "system.project_id"
* Notes
ext4_setattr interface to prjid: Semantically prjid must being changed
similar to uid/gid, but project_id is stored inside xattr so on-disk
structures updates is not that trivial, so I've move prjid change
logic to separate function.
TODO[INPROGRESS] add project quota support for lib/ext2fs lib/quota
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
---
fs/ext4/Kconfig | 8 ++
fs/ext4/Makefile | 1 +
fs/ext4/ext4.h | 4 +
fs/ext4/ialloc.c | 6 ++
fs/ext4/inode.c | 4 +
fs/ext4/project.c | 213 +++++++++++++++++++++++++++++++++++++++++++++
fs/ext4/project.h | 45 ++++++++++
fs/ext4/super.c | 16 +++-
fs/ext4/xattr.c | 7 ++
fs/ext4/xattr.h | 2 +
include/linux/ext3_fs_i.h | 1 +
11 files changed, 306 insertions(+), 1 deletions(-)
create mode 100644 fs/ext4/project.c
create mode 100644 fs/ext4/project.h
diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig
index 9ed1bb1..1c04c9f 100644
--- a/fs/ext4/Kconfig
+++ b/fs/ext4/Kconfig
@@ -74,6 +74,14 @@ config EXT4_FS_SECURITY
If you are not using a security module that requires using
extended attributes for file security labels, say N.
+config EXT4_PROJECT_ID
+ bool "Ext4 project_id support"
+ depends on PROJECT_ID
+ depends on EXT4_FS_XATTR
+ help
+ Enables project inode identifier support for ext4 filesystem.
+ This feature allow to assign some id to inodes similar to
+ uid/gid.
config EXT4_DEBUG
bool "EXT4 debugging support"
diff --git a/fs/ext4/Makefile b/fs/ext4/Makefile
index 56fd8f8..692fe56 100644
--- a/fs/ext4/Makefile
+++ b/fs/ext4/Makefile
@@ -12,3 +12,4 @@ ext4-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o page-io.o \
ext4-$(CONFIG_EXT4_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o
ext4-$(CONFIG_EXT4_FS_POSIX_ACL) += acl.o
ext4-$(CONFIG_EXT4_FS_SECURITY) += xattr_security.o
+ext4-$(CONFIG_EXT4_PROJECT_ID) += project.o
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index e92c51a..93151e7 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -867,6 +867,9 @@ struct ext4_inode_info {
*/
tid_t i_sync_tid;
tid_t i_datasync_tid;
+#ifdef CONFIG_EXT4_PROJECT_ID
+ __u32 i_prjid;
+#endif
};
/*
@@ -904,6 +907,7 @@ struct ext4_inode_info {
#define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */
#define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */
#define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */
+#define EXT4_MOUNT_PROJECT_ID 0x40000 /* project owner id support */
#define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
#define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */
#define EXT4_MOUNT_QUOTA 0x300000 /* Some quota option set */
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
index fd96ea1..af81b5f 100644
--- a/fs/ext4/ialloc.c
+++ b/fs/ext4/ialloc.c
@@ -28,6 +28,7 @@
#include "ext4_jbd2.h"
#include "xattr.h"
#include "acl.h"
+#include "project.h"
#include <trace/events/ext4.h>
@@ -1033,6 +1034,8 @@ got:
ei->i_extra_isize = EXT4_SB(sb)->s_want_extra_isize;
+ ext4_setprjid(inode, ext4_getprjid(dir));
+
ret = inode;
dquot_initialize(inode);
err = dquot_alloc_inode(inode);
@@ -1046,6 +1049,9 @@ got:
err = ext4_init_security(handle, inode, dir, qstr);
if (err)
goto fail_free_drop;
+ err = ext4_prj_init(handle, inode);
+ if (err)
+ goto fail_free_drop;
if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_EXTENTS)) {
/* set extent flag only for directory, file and normal symlink*/
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 0defe0b..b005f04 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -44,6 +44,7 @@
#include "acl.h"
#include "ext4_extents.h"
#include "truncate.h"
+#include "project.h"
#include <trace/events/ext4.h>
@@ -3541,6 +3542,9 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
}
if (ret)
goto bad_inode;
+ ret = ext4_prj_read(inode);
+ if (ret)
+ goto bad_inode;
if (S_ISREG(inode->i_mode)) {
inode->i_op = &ext4_file_inode_operations;
diff --git a/fs/ext4/project.c b/fs/ext4/project.c
new file mode 100644
index 0000000..a262a49
--- /dev/null
+++ b/fs/ext4/project.c
@@ -0,0 +1,213 @@
+/*
+ * linux/fs/ext4/projectid.c
+ *
+ * Copyright (C) 2011 Parallels Inc
+ * Dmitry Monakhov <dmonakhov@openvz.org>
+ */
+
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/slab.h>
+#include <linux/capability.h>
+#include <linux/fs.h>
+#include <linux/quotaops.h>
+#include "ext4_jbd2.h"
+#include "ext4.h"
+#include "xattr.h"
+#include "project.h"
+
+
+/*
+ * PROJECT SUBTREE
+ * A subtree of a directory tree T is a tree consisting of a directory
+ * (the subtree root) in T and all of its descendants in T.
+ *
+ * Project Subtree's assumptions:
+ * (1) Each inode has subtree id. This id is persistently stored inside
+ * inode's xattr, usually inside ibody
+ * (2) Subtree id is inherent from parent directory
+ */
+
+/*
+ * Read project_id id from inode's xattr
+ * Locking: none
+ */
+int ext4_prj_xattr_read(struct inode *inode, unsigned int *prjid)
+{
+ __le32 dsk_prjid;
+ int retval;
+ retval = ext4_xattr_get(inode, EXT4_XATTR_INDEX_PROJECT_ID, "",
+ &dsk_prjid, sizeof (dsk_prjid));
+ if (retval > 0) {
+ if (retval != sizeof(dsk_prjid))
+ return -EIO;
+ else
+ retval = 0;
+ }
+ *prjid = le32_to_cpu(dsk_prjid);
+ return retval;
+
+}
+
+/*
+ * Save project_id id to inode's xattr
+ * Locking: none
+ */
+int ext4_prj_xattr_write(handle_t *handle, struct inode *inode,
+ unsigned int prjid, int xflags)
+{
+ __le32 dsk_prjid = cpu_to_le32(prjid);
+ int retval;
+ retval = ext4_xattr_set_handle(handle,
+ inode, EXT4_XATTR_INDEX_PROJECT_ID, "",
+ &dsk_prjid, sizeof (dsk_prjid), xflags);
+ if (retval > 0) {
+ if (retval != sizeof(dsk_prjid))
+ retval = -EIO;
+ else
+ retval = 0;
+ }
+ return retval;
+}
+
+/*
+ * Change project_id id.
+ * Called under inode->i_mutex
+ */
+int ext4_prj_change(struct inode *inode, unsigned int new_prjid)
+{
+ /*
+ * One data_trans_blocks chunk for xattr update.
+ * One quota_trans_blocks chunk for quota transfer, and one
+ * quota_trans_block chunk for emergency quota rollback transfer,
+ * because quota rollback may result new quota blocks allocation.
+ */
+ unsigned credits = EXT4_DATA_TRANS_BLOCKS(inode->i_sb) +
+ EXT4_QUOTA_TRANS_BLOCKS(inode->i_sb) * 2;
+ int ret, ret2 = 0;
+ unsigned retries = 0;
+ handle_t *handle;
+ struct dquot *dquot[MAXQUOTAS] = {};
+ int old_id = ext4_getprjid(inode);
+ dquot_initialize(inode);
+
+ dquot[PRJQUOTA] = dqget(inode->i_sb, new_prjid, PRJQUOTA);
+retry:
+ handle = ext4_journal_start(inode, credits);
+ if (IS_ERR(handle)) {
+ ret = PTR_ERR(handle);
+ ext4_std_error(inode->i_sb, ret);
+ goto out;
+ }
+ /* Inode may not have project_id xattr yet. Create it explicitly */
+ ret = ext4_prj_xattr_write(handle, inode, old_id, XATTR_CREATE);
+ if (ret == -EEXIST)
+ ret = 0;
+ if (ret) {
+ ret2 = ext4_journal_stop(handle);
+ if (ret2)
+ ret = ret2;
+ if (ret == -ENOSPC &&
+ ext4_should_retry_alloc(inode->i_sb, &retries))
+ goto retry;
+ }
+#ifdef CONFIG_QUOTA
+ ret = __dquot_transfer(inode, dquot);
+ if (ret)
+ return ret;
+#endif
+ ret = ext4_prj_xattr_write(handle, inode, new_prjid, XATTR_REPLACE);
+ if (ret) {
+ /*
+ * Function may fail only due to fatal error, Nor than less
+ * we have try to rollback quota changes.
+ */
+#ifdef CONFIG_QUOTA
+ __dquot_transfer(inode, dquot);
+#endif
+ ext4_std_error(inode->i_sb, ret);
+
+ } else
+ ext4_setprjid(inode, new_prjid);
+
+ ret2 = ext4_journal_stop(handle);
+out:
+ dqput(dquot[PRJQUOTA]);
+ if (ret2)
+ ret = ret2;
+ return ret;
+}
+
+int ext4_prj_read(struct inode *inode)
+{
+ int ret = 0;
+ int prjid = 0;
+ if(test_opt(inode->i_sb, PROJECT_ID)) {
+ ret = ext4_prj_xattr_read(inode, &prjid);
+ if (ret == -ENODATA) {
+ prjid = 0;
+ ret = 0;
+ }
+ }
+ if (!ret)
+ ext4_setprjid(inode, prjid);
+ return ret;
+}
+/*
+ * Initialize the projectid xattr of a new inode. Called from ext4_new_inode.
+ *
+ * dir->i_mutex: down
+ * inode->i_mutex: up (access to inode is still exclusive)
+ * Note: caller must assign correct project id to inode before.
+ */
+int ext4_prj_init(handle_t *handle, struct inode *inode)
+{
+ return ext4_prj_xattr_write(handle, inode, EXT4_I(inode)->i_prjid,
+ XATTR_CREATE);
+}
+
+static size_t
+ext4_xattr_prj_list(struct dentry *dentry, char *list, size_t list_size,
+ const char *name, size_t name_len, int type)
+{
+ if (list && XATTR_PRJID_LEN <= list_size)
+ memcpy(list, XATTR_PRJID, XATTR_PRJID_LEN);
+ return XATTR_PRJID_LEN;
+
+}
+
+static int
+ext4_xattr_prj_get(struct dentry *dentry, const char *name,
+ void *buffer, size_t size, int type)
+{
+ int ret;
+ unsigned prjid;
+ char buf[32];
+ if (strcmp(name, "") != 0)
+ return -EINVAL;
+ ret = ext4_prj_xattr_read(dentry->d_inode, &prjid);
+ if (ret)
+ return ret;
+ snprintf(buf, sizeof(buf)-1, "%u", prjid);
+ buf[31] = '\0';
+ strncpy(buffer, buf, size);
+ return strlen(buf);
+}
+
+static int
+ext4_xattr_prj_set(struct dentry *dentry, const char *name,
+ const void *value, size_t size, int flags, int type)
+{
+ unsigned int new_prjid;
+ if (strcmp(name, "") != 0)
+ return -EINVAL;
+ new_prjid = simple_strtoul(value, (char **)&value, 0);
+ return ext4_prj_change(dentry->d_inode, new_prjid);
+}
+
+const struct xattr_handler ext4_xattr_prj_handler = {
+ .prefix = XATTR_PRJID,
+ .list = ext4_xattr_prj_list,
+ .get = ext4_xattr_prj_get,
+ .set = ext4_xattr_prj_set,
+};
diff --git a/fs/ext4/project.h b/fs/ext4/project.h
new file mode 100644
index 0000000..054ec4c
--- /dev/null
+++ b/fs/ext4/project.h
@@ -0,0 +1,45 @@
+#include <linux/xattr.h>
+#include <linux/fs.h>
+
+#ifdef CONFIG_EXT4_PROJECT_ID
+extern int ext4_prj_xattr_read(struct inode *inode, unsigned int *prjid);
+extern int ext4_prj_xattr_write(handle_t *handle, struct inode *inode,
+ unsigned int prjid, int xflags);
+extern int ext4_prj_init(handle_t *handle, struct inode *inode);
+extern int ext4_prj_read(struct inode *inode);
+extern int ext4_prj_change(struct inode *inode, unsigned int new_prjid);
+static inline u32 ext4_getprjid(const struct inode *inode)
+{
+ const struct ext4_inode_info *ei =
+ container_of(inode, const struct ext4_inode_info, vfs_inode);
+ return ei->i_prjid;
+}
+static inline void ext4_setprjid(struct inode *inode, u32 id)
+{
+ EXT4_I(inode)->i_prjid = id;
+}
+#else
+#define ext4_getprjid(inode) do {} while (0)
+#define ext4_setprjid(inode, id) do {} while (0)
+static inline int ext4_prj_xattr_read(struct inode *inode, unsigned int *prjid)
+{
+ return -ENOTSUPP;
+}
+static inline int ext4_prj_xattr_write(handle_t *handle, struct inode *inode,
+ unsigned int prjid, int xflags)
+{
+ return -ENOTSUPP;
+}
+static inline int ext4_prj_read(struct inode *inode)
+{
+ return 0;
+}
+static inline int ext4_prj_change(struct inode *inode, unsigned int new_prjid)
+{
+ return -ENOTSUPP;
+}
+static inline int ext4_prj_init(handle_t *handle, struct inode *inode)
+{
+ return 0;
+}
+#endif
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 74d2726..fefc007 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -49,6 +49,7 @@
#include "xattr.h"
#include "acl.h"
#include "mballoc.h"
+#include "project.h"
#define CREATE_TRACE_POINTS
#include <trace/events/ext4.h>
@@ -1129,6 +1130,9 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
if (test_opt(sb, DISCARD) && !(def_mount_opts & EXT4_DEFM_DISCARD))
seq_puts(seq, ",discard");
+ if (test_opt(sb, PROJECT_ID))
+ seq_puts(seq, ",prjid");
+
if (test_opt(sb, NOLOAD))
seq_puts(seq, ",norecovery");
@@ -1272,6 +1276,9 @@ static const struct super_operations ext4_sops = {
.quota_write = ext4_quota_write,
#endif
.bdev_try_to_free_page = bdev_try_to_free_page,
+#ifdef CONFIG_EXT4_PROJECT_ID
+ .get_prjid = ext4_getprjid,
+#endif
};
static const struct super_operations ext4_nojournal_sops = {
@@ -1291,6 +1298,9 @@ static const struct super_operations ext4_nojournal_sops = {
.quota_write = ext4_quota_write,
#endif
.bdev_try_to_free_page = bdev_try_to_free_page,
+#ifdef CONFIG_EXT4_PROJECT_ID
+ .get_prjid = ext4_getprjid,
+#endif
};
static const struct export_operations ext4_export_ops = {
@@ -1318,7 +1328,7 @@ enum {
Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity,
Opt_inode_readahead_blks, Opt_journal_ioprio,
Opt_dioread_nolock, Opt_dioread_lock,
- Opt_discard, Opt_nodiscard,
+ Opt_discard, Opt_nodiscard, Opt_project_id,
Opt_init_inode_table, Opt_noinit_inode_table,
};
@@ -1395,6 +1405,7 @@ static const match_table_t tokens = {
{Opt_init_inode_table, "init_itable=%u"},
{Opt_init_inode_table, "init_itable"},
{Opt_noinit_inode_table, "noinit_itable"},
+ {Opt_project_id, "prjid"},
{Opt_err, NULL},
};
@@ -1882,6 +1893,9 @@ set_qf_format:
case Opt_noinit_inode_table:
clear_opt(sb, INIT_INODE_TABLE);
break;
+ case Opt_project_id:
+ set_opt(sbi->s_mount_opt, PROJECT_ID);
+ break;
default:
ext4_msg(sb, KERN_ERR,
"Unrecognized mount option \"%s\" "
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
index c757adc..13dc05d 100644
--- a/fs/ext4/xattr.c
+++ b/fs/ext4/xattr.c
@@ -107,6 +107,10 @@ static const struct xattr_handler *ext4_xattr_handler_map[] = {
#ifdef CONFIG_EXT4_FS_SECURITY
[EXT4_XATTR_INDEX_SECURITY] = &ext4_xattr_security_handler,
#endif
+#ifdef CONFIG_EXT4_PROJECT_ID
+ [EXT4_XATTR_INDEX_PROJECT_ID] = &ext4_xattr_prj_handler,
+#endif
+
};
const struct xattr_handler *ext4_xattr_handlers[] = {
@@ -119,6 +123,9 @@ const struct xattr_handler *ext4_xattr_handlers[] = {
#ifdef CONFIG_EXT4_FS_SECURITY
&ext4_xattr_security_handler,
#endif
+#ifdef CONFIG_EXT4_PROJECT_ID
+ &ext4_xattr_prj_handler,
+#endif
NULL
};
diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h
index 25b7387..4f03863 100644
--- a/fs/ext4/xattr.h
+++ b/fs/ext4/xattr.h
@@ -21,6 +21,7 @@
#define EXT4_XATTR_INDEX_TRUSTED 4
#define EXT4_XATTR_INDEX_LUSTRE 5
#define EXT4_XATTR_INDEX_SECURITY 6
+#define EXT4_XATTR_INDEX_PROJECT_ID 7
struct ext4_xattr_header {
__le32 h_magic; /* magic number for identification */
@@ -70,6 +71,7 @@ extern const struct xattr_handler ext4_xattr_trusted_handler;
extern const struct xattr_handler ext4_xattr_acl_access_handler;
extern const struct xattr_handler ext4_xattr_acl_default_handler;
extern const struct xattr_handler ext4_xattr_security_handler;
+extern const struct xattr_handler ext4_xattr_prj_handler;
extern ssize_t ext4_listxattr(struct dentry *, char *, size_t);
diff --git a/include/linux/ext3_fs_i.h b/include/linux/ext3_fs_i.h
index f42c098..77ad18f 100644
--- a/include/linux/ext3_fs_i.h
+++ b/include/linux/ext3_fs_i.h
@@ -87,6 +87,7 @@ struct ext3_inode_info {
* near to their parent directory's inode.
*/
__u32 i_block_group;
+ __u32 i_prjid;
unsigned long i_state_flags; /* Dynamic state flags for ext3 */
/* block reservation info */
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 6/6] ext4: add project quota support
2011-10-02 19:44 [PATCH 1/6] RFC: introduce extended inode owner identifier v8 Dmitry Monakhov
` (3 preceding siblings ...)
2011-10-02 19:44 ` [PATCH 5/6] ext4: Implement project ID support for ext4 filesystem Dmitry Monakhov
@ 2011-10-02 19:44 ` Dmitry Monakhov
4 siblings, 0 replies; 6+ messages in thread
From: Dmitry Monakhov @ 2011-10-02 19:44 UTC (permalink / raw)
To: linux-fsdevel; +Cc: linux-ext4, jack, viro, adityakali, Dmitry Monakhov
Both regular and journaled quota are supported.
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
---
fs/ext4/ext4.h | 1 +
fs/ext4/super.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 55 insertions(+), 8 deletions(-)
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 93151e7..b32aaca 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -897,6 +897,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 fefc007..85eda58 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1004,11 +1004,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
}
@@ -1218,8 +1225,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);
@@ -1320,10 +1327,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_mblk_io_submit,
Opt_nomblk_io_submit, Opt_block_validity, Opt_noblock_validity,
Opt_inode_readahead_blks, Opt_journal_ioprio,
@@ -1374,10 +1382,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"},
@@ -1701,6 +1712,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;
@@ -1711,7 +1732,15 @@ static int parse_options(char *options, struct super_block *sb,
return 0;
clear_opt(sb, USRQUOTA);
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;
@@ -1737,6 +1766,15 @@ set_qf_format:
case Opt_grpquota:
set_opt(sb, GRPQUOTA);
break;
+ case Opt_prjquota:
+#ifdef CONFIG_PROJECT_ID
+ set_opt(sb, PROJECT_ID);
+ set_opt(sb, 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 "
@@ -1749,13 +1787,16 @@ set_qf_format:
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_prjquota:
case Opt_offusrjquota:
case Opt_offgrpjquota:
+ case Opt_offprjquota:
case Opt_jqfmt_vfsold:
case Opt_jqfmt_vfsv0:
case Opt_jqfmt_vfsv1:
@@ -1894,7 +1935,7 @@ set_qf_format:
clear_opt(sb, INIT_INODE_TABLE);
break;
case Opt_project_id:
- set_opt(sbi->s_mount_opt, PROJECT_ID);
+ set_opt(sb, PROJECT_ID);
break;
default:
ext4_msg(sb, KERN_ERR,
@@ -1904,7 +1945,8 @@ 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]) {
int jquota = 0;
if (test_opt(sb, USRQUOTA) && sbi->s_qf_names[USRQUOTA])
jquota |= EXT4_MOUNT_USRQUOTA;
@@ -1912,6 +1954,9 @@ set_qf_format:
if (test_opt(sb, GRPQUOTA) && sbi->s_qf_names[GRPQUOTA])
jquota |= EXT4_MOUNT_GRPQUOTA;
+ if (test_opt(sb, PRJQUOTA) && sbi->s_qf_names[PRJQUOTA])
+ jquota |= EXT4_MOUNT_PRJQUOTA;
+
if (test_opt(sb, QUOTA) != jquota) {
ext4_msg(sb, KERN_ERR, "old and new quota "
"format mixing");
@@ -4660,7 +4705,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 {
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-10-02 19:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-02 19:44 [PATCH 1/6] RFC: introduce extended inode owner identifier v8 Dmitry Monakhov
2011-10-02 19:44 ` [PATCH 2/6] Add additional owner identifier Dmitry Monakhov
2011-10-02 19:44 ` [PATCH 3/6] Implement project id support for generic quota Dmitry Monakhov
2011-10-02 19:44 ` [PATCH 4/6] ext4: get rid of didicated MOUNT_QUOTA option Dmitry Monakhov
2011-10-02 19:44 ` [PATCH 5/6] ext4: Implement project ID support for ext4 filesystem Dmitry Monakhov
2011-10-02 19:44 ` [PATCH 6/6] ext4: add project quota support Dmitry Monakhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).