Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a224ad1 authored by Jan Kara's avatar Jan Kara Committed by Mark Fasheh
Browse files

ocfs2: Assign feature bits and system inodes to quota feature and quota files 



Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent 90e86a63

fs/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -189,6 +189,8 @@ config OCFS2_FS 
	select CONFIGFS_FS

	select JBD2

	select CRC32

	select QUOTA

	select QUOTA_TREE

	help

	  OCFS2 is a general purpose extent based shared disk cluster file

	  system with many similarities to ext3. It supports 64 bit inode

fs/ocfs2/inode.c

+2 −0
Original line number Diff line number Diff line
@@ -283,6 +283,8 @@ void ocfs2_populate_inode(struct inode *inode, struct ocfs2_dinode *fe, 
		mlog(0, "local alloc inode: i_ino=%lu\n", inode->i_ino);

	} else if (fe->i_flags & cpu_to_le32(OCFS2_BITMAP_FL)) {

		OCFS2_I(inode)->ip_flags |= OCFS2_INODE_BITMAP;

	} else if (fe->i_flags & cpu_to_le32(OCFS2_QUOTA_FL)) {

		inode->i_flags |= S_NOQUOTA;

	} else if (fe->i_flags & cpu_to_le32(OCFS2_SUPER_BLOCK_FL)) {

		mlog(0, "superblock inode: i_ino=%lu\n", inode->i_ino);

		/* we can't actually hit this as read_inode can't

fs/ocfs2/ocfs2_fs.h

+18 −3
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ 
					 | OCFS2_FEATURE_INCOMPAT_EXTENDED_SLOT_MAP \

					 | OCFS2_FEATURE_INCOMPAT_USERSPACE_STACK \

					 | OCFS2_FEATURE_INCOMPAT_XATTR)

#define OCFS2_FEATURE_RO_COMPAT_SUPP	OCFS2_FEATURE_RO_COMPAT_UNWRITTEN

#define OCFS2_FEATURE_RO_COMPAT_SUPP	(OCFS2_FEATURE_RO_COMPAT_UNWRITTEN)



/*

 * Heartbeat-only devices are missing journals and other files.  The
@@ -163,6 +163,12 @@ 
 */

#define OCFS2_FEATURE_RO_COMPAT_UNWRITTEN	0x0001



/*

 * Maintain quota information for this filesystem

 */

#define OCFS2_FEATURE_RO_COMPAT_USRQUOTA	0x0002

#define OCFS2_FEATURE_RO_COMPAT_GRPQUOTA	0x0004



/* The byte offset of the first backup block will be 1G.

 * The following will be 4G, 16G, 64G, 256G and 1T.

 */
@@ -192,6 +198,7 @@ 
#define OCFS2_HEARTBEAT_FL	(0x00000200)	/* Heartbeat area */

#define OCFS2_CHAIN_FL		(0x00000400)	/* Chain allocator */

#define OCFS2_DEALLOC_FL	(0x00000800)	/* Truncate log */

#define OCFS2_QUOTA_FL		(0x00001000)	/* Quota file */



/*

 * Flags on ocfs2_dinode.i_dyn_features
@@ -329,13 +336,17 @@ enum { 
#define OCFS2_FIRST_ONLINE_SYSTEM_INODE SLOT_MAP_SYSTEM_INODE

	HEARTBEAT_SYSTEM_INODE,

	GLOBAL_BITMAP_SYSTEM_INODE,

#define OCFS2_LAST_GLOBAL_SYSTEM_INODE GLOBAL_BITMAP_SYSTEM_INODE

	USER_QUOTA_SYSTEM_INODE,

	GROUP_QUOTA_SYSTEM_INODE,

#define OCFS2_LAST_GLOBAL_SYSTEM_INODE GROUP_QUOTA_SYSTEM_INODE

	ORPHAN_DIR_SYSTEM_INODE,

	EXTENT_ALLOC_SYSTEM_INODE,

	INODE_ALLOC_SYSTEM_INODE,

	JOURNAL_SYSTEM_INODE,

	LOCAL_ALLOC_SYSTEM_INODE,

	TRUNCATE_LOG_SYSTEM_INODE,

	LOCAL_USER_QUOTA_SYSTEM_INODE,

	LOCAL_GROUP_QUOTA_SYSTEM_INODE,

	NUM_SYSTEM_INODES

};
@@ -349,6 +360,8 @@ static struct ocfs2_system_inode_info ocfs2_system_inodes[NUM_SYSTEM_INODES] = { 
	[SLOT_MAP_SYSTEM_INODE]			= { "slot_map", 0, S_IFREG | 0644 },

	[HEARTBEAT_SYSTEM_INODE]		= { "heartbeat", OCFS2_HEARTBEAT_FL, S_IFREG | 0644 },

	[GLOBAL_BITMAP_SYSTEM_INODE]		= { "global_bitmap", 0, S_IFREG | 0644 },

	[USER_QUOTA_SYSTEM_INODE]		= { "aquota.user", OCFS2_QUOTA_FL, S_IFREG | 0644 },

	[GROUP_QUOTA_SYSTEM_INODE]		= { "aquota.group", OCFS2_QUOTA_FL, S_IFREG | 0644 },



	/* Slot-specific system inodes (one copy per slot) */

	[ORPHAN_DIR_SYSTEM_INODE]		= { "orphan_dir:%04d", 0, S_IFDIR | 0755 },
@@ -356,7 +369,9 @@ static struct ocfs2_system_inode_info ocfs2_system_inodes[NUM_SYSTEM_INODES] = { 
	[INODE_ALLOC_SYSTEM_INODE]		= { "inode_alloc:%04d", OCFS2_BITMAP_FL | OCFS2_CHAIN_FL, S_IFREG | 0644 },

	[JOURNAL_SYSTEM_INODE]			= { "journal:%04d", OCFS2_JOURNAL_FL, S_IFREG | 0644 },

	[LOCAL_ALLOC_SYSTEM_INODE]		= { "local_alloc:%04d", OCFS2_BITMAP_FL | OCFS2_LOCAL_ALLOC_FL, S_IFREG | 0644 },

	[TRUNCATE_LOG_SYSTEM_INODE]		= { "truncate_log:%04d", OCFS2_DEALLOC_FL, S_IFREG | 0644 }

	[TRUNCATE_LOG_SYSTEM_INODE]		= { "truncate_log:%04d", OCFS2_DEALLOC_FL, S_IFREG | 0644 },

	[LOCAL_USER_QUOTA_SYSTEM_INODE]		= { "aquota.user:%04d", OCFS2_QUOTA_FL, S_IFREG | 0644 },

	[LOCAL_GROUP_QUOTA_SYSTEM_INODE]	= { "aquota.group:%04d", OCFS2_QUOTA_FL, S_IFREG | 0644 },

};



/* Parameter passed from mount.ocfs2 to module */

fs/ocfs2/super.c

+17 −0
Original line number Diff line number Diff line
@@ -225,6 +225,19 @@ static int ocfs2_sync_fs(struct super_block *sb, int wait) 
	return 0;

}



static int ocfs2_need_system_inode(struct ocfs2_super *osb, int ino)

{

	if (!OCFS2_HAS_RO_COMPAT_FEATURE(osb->sb, OCFS2_FEATURE_RO_COMPAT_USRQUOTA)

	    && (ino == USER_QUOTA_SYSTEM_INODE

		|| ino == LOCAL_USER_QUOTA_SYSTEM_INODE))

		return 0;

	if (!OCFS2_HAS_RO_COMPAT_FEATURE(osb->sb, OCFS2_FEATURE_RO_COMPAT_GRPQUOTA)

	    && (ino == GROUP_QUOTA_SYSTEM_INODE

		|| ino == LOCAL_GROUP_QUOTA_SYSTEM_INODE))

		return 0;

	return 1;

}



static int ocfs2_init_global_system_inodes(struct ocfs2_super *osb)

{

	struct inode *new = NULL;
@@ -251,6 +264,8 @@ static int ocfs2_init_global_system_inodes(struct ocfs2_super *osb) 


	for (i = OCFS2_FIRST_ONLINE_SYSTEM_INODE;

	     i <= OCFS2_LAST_GLOBAL_SYSTEM_INODE; i++) {

		if (!ocfs2_need_system_inode(osb, i))

			continue;

		new = ocfs2_get_system_file_inode(osb, i, osb->slot_num);

		if (!new) {

			ocfs2_release_system_inodes(osb);
@@ -281,6 +296,8 @@ static int ocfs2_init_local_system_inodes(struct ocfs2_super *osb) 
	for (i = OCFS2_LAST_GLOBAL_SYSTEM_INODE + 1;

	     i < NUM_SYSTEM_INODES;

	     i++) {

		if (!ocfs2_need_system_inode(osb, i))

			continue;

		new = ocfs2_get_system_file_inode(osb, i, osb->slot_num);

		if (!new) {

			ocfs2_release_system_inodes(osb);