From: Li Xi <lixi@ddn.com>
Date: Fri, 20 Mar 2015 04:55:39 +0000 (+0800)
Subject: LU-4017 e2fsprogs: add project feature
X-Git-Tag: v1.42.13.wc6~10
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=2a6d0ebb428b79563a9723c4143c3bb14001d94a;p=tools%2Fe2fsprogs.git

LU-4017 e2fsprogs: add project feature

This patch add project feature EXT4_FEATURE_RO_COMPAT_PROJECT

Signed-off-by: Li Xi <lixi@ddn.com>
Signed-off-by: Wang Shilong <wshilong@ddn.com>
Change-Id: I6b30b8c7d88e8256a1a3fa7d1651b4495e54f4f6
Reviewed-on: http://review.whamcloud.com/15763
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
---

diff --git a/lib/e2p/feature.c b/lib/e2p/feature.c
index 2ff95dc..2dff201 100644
--- a/lib/e2p/feature.c
+++ b/lib/e2p/feature.c
@@ -68,7 +68,8 @@ static struct feature feature_list[] = {
 			"metadata_csum"},
 	{	E2P_FEATURE_RO_INCOMPAT, EXT4_FEATURE_RO_COMPAT_REPLICA,
 			"replica" },
-
+	{	E2P_FEATURE_RO_INCOMPAT, EXT4_FEATURE_RO_COMPAT_PROJECT,
+			"project"},
 	{	E2P_FEATURE_INCOMPAT, EXT2_FEATURE_INCOMPAT_COMPRESSION,
 			"compression" },
 	{	E2P_FEATURE_INCOMPAT, EXT2_FEATURE_INCOMPAT_FILETYPE,
diff --git a/lib/ext2fs/ext2_fs.h b/lib/ext2fs/ext2_fs.h
index 1e5aaa8..efde7a5 100644
--- a/lib/ext2fs/ext2_fs.h
+++ b/lib/ext2fs/ext2_fs.h
@@ -723,6 +723,7 @@ struct ext2_super_block {
 #define EXT4_FEATURE_RO_COMPAT_BIGALLOC		0x0200
 #define EXT4_FEATURE_RO_COMPAT_METADATA_CSUM	0x0400
 #define EXT4_FEATURE_RO_COMPAT_REPLICA		0x0800
+#define EXT4_FEATURE_RO_COMPAT_PROJECT		0x2000 /* Project quota */
 
 #define EXT2_FEATURE_INCOMPAT_COMPRESSION	0x0001
 #define EXT2_FEATURE_INCOMPAT_FILETYPE		0x0002
diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index e66d2fc..9eb6d56 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -600,7 +600,8 @@ typedef struct ext2_icount *ext2_icount_t;
 					 EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE|\
 					 EXT4_FEATURE_RO_COMPAT_GDT_CSUM|\
 					 EXT4_FEATURE_RO_COMPAT_BIGALLOC|\
-					 EXT4_FEATURE_RO_COMPAT_QUOTA)
+					 EXT4_FEATURE_RO_COMPAT_QUOTA | \
+					 EXT4_FEATURE_RO_COMPAT_PROJECT)
 #else
 #define EXT2_LIB_FEATURE_RO_COMPAT_SUPP	(EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER|\
 					 EXT4_FEATURE_RO_COMPAT_HUGE_FILE|\
diff --git a/misc/ext4.5.in b/misc/ext4.5.in
index a862a34..0bfbe0d 100644
--- a/misc/ext4.5.in
+++ b/misc/ext4.5.in
@@ -210,6 +210,12 @@ shared storage environments.
 @QUOTA_MAN_COMMENT@Causes the quota files (i.e., user.quota and
 @QUOTA_MAN_COMMENT@group.quota which existed
 @QUOTA_MAN_COMMENT@in the older quota design) to be hidden inodes.
+@QUOTA_MAN_COMMENT@.TP
+@QUOTA_MAN_COMMENT@.B project
+@QUOTA_MAN_COMMENT@.br
+@QUOTA_MAN_COMMENT@This ext4 feature provides project quota support.
+@QUOTA_MAN_COMMENT@With this feature, the project ID of inode will be
+@QUOTA_MAN_COMMENT@managed when the filesystem is mounted.
 .TP
 .B resize_inode
 .br
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 0e4d493..99e2d64 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1006,6 +1006,7 @@ static __u32 ok_features[3] = {
 		EXT4_FEATURE_RO_COMPAT_BIGALLOC|
 #ifdef CONFIG_QUOTA
 		EXT4_FEATURE_RO_COMPAT_QUOTA|
+		EXT4_FEATURE_RO_COMPAT_PROJECT|
 #endif
 		0
 };
diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index a1a84e1..2cd6093 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -153,6 +153,7 @@ static __u32 ok_features[3] = {
 		EXT4_FEATURE_RO_COMPAT_GDT_CSUM |
 #ifdef CONFIG_QUOTA
 		EXT4_FEATURE_RO_COMPAT_QUOTA |
+		EXT4_FEATURE_RO_COMPAT_PROJECT |
 #endif
 		EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER
 };