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

Commit 040cb378 authored by Li Xi's avatar Li Xi Committed by Theodore Ts'o
Browse files

ext4: adds project ID support 



Signed-off-by: default avatarLi Xi <lixi@ddn.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarAndreas Dilger <adilger@dilger.ca>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
parent 56a04915

fs/ext4/ext4.h

+13 −4
Original line number Diff line number Diff line
@@ -378,14 +378,15 @@ struct flex_groups { 
#define EXT4_PROJINHERIT_FL		0x20000000 /* Create with parents projid */

#define EXT4_RESERVED_FL		0x80000000 /* reserved for ext4 lib */



#define EXT4_FL_USER_VISIBLE		0x004BDFFF /* User visible flags */

#define EXT4_FL_USER_MODIFIABLE		0x004380FF /* User modifiable flags */

#define EXT4_FL_USER_VISIBLE		0x304BDFFF /* User visible flags */

#define EXT4_FL_USER_MODIFIABLE		0x204380FF /* User modifiable flags */



/* Flags that should be inherited by new inodes from their parent. */

#define EXT4_FL_INHERITED (EXT4_SECRM_FL | EXT4_UNRM_FL | EXT4_COMPR_FL |\

			   EXT4_SYNC_FL | EXT4_NODUMP_FL | EXT4_NOATIME_FL |\

			   EXT4_NOCOMPR_FL | EXT4_JOURNAL_DATA_FL |\

			   EXT4_NOTAIL_FL | EXT4_DIRSYNC_FL)

			   EXT4_NOTAIL_FL | EXT4_DIRSYNC_FL |\

			   EXT4_PROJINHERIT_FL)



/* Flags that are appropriate for regular files (all but dir-specific ones). */

#define EXT4_REG_FLMASK (~(EXT4_DIRSYNC_FL | EXT4_TOPDIR_FL))
@@ -1004,6 +1005,7 @@ struct ext4_inode_info { 
	/* Encryption params */

	struct ext4_crypt_info *i_crypt_info;

#endif

	kprojid_t i_projid;

};



/*
@@ -1765,7 +1767,8 @@ EXT4_FEATURE_INCOMPAT_FUNCS(encrypt, ENCRYPT) 
					 EXT4_FEATURE_RO_COMPAT_HUGE_FILE |\

					 EXT4_FEATURE_RO_COMPAT_BIGALLOC |\

					 EXT4_FEATURE_RO_COMPAT_METADATA_CSUM|\

					 EXT4_FEATURE_RO_COMPAT_QUOTA)

					 EXT4_FEATURE_RO_COMPAT_QUOTA |\

					 EXT4_FEATURE_RO_COMPAT_PROJECT)



#define EXTN_FEATURE_FUNCS(ver) \

static inline bool ext4_has_unknown_ext##ver##_compat_features(struct super_block *sb) \
@@ -1807,6 +1810,11 @@ static inline bool ext4_has_incompat_features(struct super_block *sb) 
#define	EXT4_DEF_RESUID		0

#define	EXT4_DEF_RESGID		0



/*

 * Default project ID

 */

#define	EXT4_DEF_PROJID		0



#define EXT4_DEF_INODE_READAHEAD_BLKS	32



/*
@@ -2498,6 +2506,7 @@ extern int ext4_zero_partial_blocks(handle_t *handle, struct inode *inode, 
extern int ext4_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf);

extern int ext4_filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf);

extern qsize_t *ext4_get_reserved_space(struct inode *inode);

extern int ext4_get_projid(struct inode *inode, kprojid_t *projid);

extern void ext4_da_update_reserve_space(struct inode *inode,

					int used, int quota_claim);

extern int ext4_issue_zeroout(struct inode *inode, ext4_lblk_t lblk,

fs/ext4/ialloc.c

+7 −0
Original line number Diff line number Diff line
@@ -799,6 +799,13 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir, 
		inode->i_gid = dir->i_gid;

	} else

		inode_init_owner(inode, dir, mode);



	if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_PROJECT) &&

	    ext4_test_inode_flag(dir, EXT4_INODE_PROJINHERIT))

		ei->i_projid = EXT4_I(dir)->i_projid;

	else

		ei->i_projid = make_kprojid(&init_user_ns, EXT4_DEF_PROJID);



	err = dquot_initialize(inode);

	if (err)

		goto out;

fs/ext4/inode.c

+28 −0
Original line number Diff line number Diff line
@@ -4193,6 +4193,14 @@ static inline void ext4_iget_extra_inode(struct inode *inode, 
		EXT4_I(inode)->i_inline_off = 0;

}



int ext4_get_projid(struct inode *inode, kprojid_t *projid)

{

	if (!EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb, EXT4_FEATURE_RO_COMPAT_PROJECT))

		return -EOPNOTSUPP;

	*projid = EXT4_I(inode)->i_projid;

	return 0;

}



struct inode *ext4_iget(struct super_block *sb, unsigned long ino)

{

	struct ext4_iloc iloc;
@@ -4204,6 +4212,7 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) 
	int block;

	uid_t i_uid;

	gid_t i_gid;

	projid_t i_projid;



	inode = iget_locked(sb, ino);

	if (!inode)
@@ -4253,12 +4262,20 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) 
	inode->i_mode = le16_to_cpu(raw_inode->i_mode);

	i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);

	i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);

	if (EXT4_HAS_RO_COMPAT_FEATURE(sb, EXT4_FEATURE_RO_COMPAT_PROJECT) &&

	    EXT4_INODE_SIZE(sb) > EXT4_GOOD_OLD_INODE_SIZE &&

	    EXT4_FITS_IN_INODE(raw_inode, ei, i_projid))

		i_projid = (projid_t)le32_to_cpu(raw_inode->i_projid);

	else

		i_projid = EXT4_DEF_PROJID;



	if (!(test_opt(inode->i_sb, NO_UID32))) {

		i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;

		i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;

	}

	i_uid_write(inode, i_uid);

	i_gid_write(inode, i_gid);

	ei->i_projid = make_kprojid(&init_user_ns, i_projid);

	set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));



	ext4_clear_state_flags(ei);	/* Only relevant on 32-bit archs */
@@ -4556,6 +4573,7 @@ static int ext4_do_update_inode(handle_t *handle, 
	int need_datasync = 0, set_large_file = 0;

	uid_t i_uid;

	gid_t i_gid;

	projid_t i_projid;



	spin_lock(&ei->i_raw_lock);
@@ -4568,6 +4586,7 @@ static int ext4_do_update_inode(handle_t *handle, 
	raw_inode->i_mode = cpu_to_le16(inode->i_mode);

	i_uid = i_uid_read(inode);

	i_gid = i_gid_read(inode);

	i_projid = from_kprojid(&init_user_ns, ei->i_projid);

	if (!(test_opt(inode->i_sb, NO_UID32))) {

		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid));

		raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid));
@@ -4645,6 +4664,15 @@ static int ext4_do_update_inode(handle_t *handle, 
				cpu_to_le16(ei->i_extra_isize);

		}

	}



	BUG_ON(!EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb,

			EXT4_FEATURE_RO_COMPAT_PROJECT) &&

	       i_projid != EXT4_DEF_PROJID);



	if (EXT4_INODE_SIZE(inode->i_sb) > EXT4_GOOD_OLD_INODE_SIZE &&

	    EXT4_FITS_IN_INODE(raw_inode, ei, i_projid))

		raw_inode->i_projid = cpu_to_le32(i_projid);



	ext4_inode_csum_set(inode, raw_inode, ei);

	spin_unlock(&ei->i_raw_lock);

	if (inode->i_sb->s_flags & MS_LAZYTIME)

fs/ext4/namei.c

+19 −0
Original line number Diff line number Diff line
@@ -3208,6 +3208,12 @@ static int ext4_link(struct dentry *old_dentry, 
	if (ext4_encrypted_inode(dir) &&

	    !ext4_is_child_context_consistent_with_parent(dir, inode))

		return -EPERM;



       if ((ext4_test_inode_flag(dir, EXT4_INODE_PROJINHERIT)) &&

	   (!projid_eq(EXT4_I(dir)->i_projid,

		       EXT4_I(old_dentry->d_inode)->i_projid)))

		return -EXDEV;



	err = dquot_initialize(dir);

	if (err)

		return err;
@@ -3488,6 +3494,11 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, 
	int credits;

	u8 old_file_type;



	if ((ext4_test_inode_flag(new_dir, EXT4_INODE_PROJINHERIT)) &&

	    (!projid_eq(EXT4_I(new_dir)->i_projid,

			EXT4_I(old_dentry->d_inode)->i_projid)))

		return -EXDEV;



	retval = dquot_initialize(old.dir);

	if (retval)

		return retval;
@@ -3697,6 +3708,14 @@ static int ext4_cross_rename(struct inode *old_dir, struct dentry *old_dentry, 
							   new.inode)))

		return -EPERM;



	if ((ext4_test_inode_flag(new_dir, EXT4_INODE_PROJINHERIT) &&

	     !projid_eq(EXT4_I(new_dir)->i_projid,

			EXT4_I(old_dentry->d_inode)->i_projid)) ||

	    (ext4_test_inode_flag(old_dir, EXT4_INODE_PROJINHERIT) &&

	     !projid_eq(EXT4_I(old_dir)->i_projid,

			EXT4_I(new_dentry->d_inode)->i_projid)))

		return -EXDEV;



	retval = dquot_initialize(old.dir);

	if (retval)

		return retval;

fs/ext4/super.c

+1 −0
Original line number Diff line number Diff line
@@ -1131,6 +1131,7 @@ static const struct dquot_operations ext4_quota_operations = { 
	.write_info	= ext4_write_info,

	.alloc_dquot	= dquot_alloc,

	.destroy_dquot	= dquot_destroy,

	.get_projid	= ext4_get_projid,

};



static const struct quotactl_ops ext4_qctl_operations = {