Commit 234a9689 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: add quota_ino feature infra 



This patch adds quota_ino feature infra to be used for quota files.

Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 37a0ab2a

fs/f2fs/f2fs.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -122,6 +122,7 @@ struct f2fs_mount_info { 
#define F2FS_FEATURE_PRJQUOTA		0x0010

#define F2FS_FEATURE_PRJQUOTA		0x0010

#define F2FS_FEATURE_INODE_CHKSUM	0x0020

#define F2FS_FEATURE_INODE_CHKSUM	0x0020

#define F2FS_FEATURE_FLEXIBLE_INLINE_XATTR	0x0040

#define F2FS_FEATURE_FLEXIBLE_INLINE_XATTR	0x0040

#define F2FS_FEATURE_QUOTA_INO		0x0080





#define F2FS_HAS_FEATURE(sb, mask)					\

#define F2FS_HAS_FEATURE(sb, mask)					\

	((F2FS_SB(sb)->raw_super->feature & cpu_to_le32(mask)) != 0)

	((F2FS_SB(sb)->raw_super->feature & cpu_to_le32(mask)) != 0)
@@ -3070,6 +3071,11 @@ static inline int f2fs_sb_has_flexible_inline_xattr(struct super_block *sb) 
	return F2FS_HAS_FEATURE(sb, F2FS_FEATURE_FLEXIBLE_INLINE_XATTR);

	return F2FS_HAS_FEATURE(sb, F2FS_FEATURE_FLEXIBLE_INLINE_XATTR);

}

}





static inline int f2fs_sb_has_quota_ino(struct super_block *sb)

{

	return F2FS_HAS_FEATURE(sb, F2FS_FEATURE_QUOTA_INO);

}



#ifdef CONFIG_BLK_DEV_ZONED

#ifdef CONFIG_BLK_DEV_ZONED

static inline int get_blkz_type(struct f2fs_sb_info *sbi,

static inline int get_blkz_type(struct f2fs_sb_info *sbi,

			struct block_device *bdev, block_t blkaddr)

			struct block_device *bdev, block_t blkaddr)

fs/f2fs/sysfs.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -110,6 +110,9 @@ static ssize_t features_show(struct f2fs_attr *a, 
	if (f2fs_sb_has_flexible_inline_xattr(sb))

	if (f2fs_sb_has_flexible_inline_xattr(sb))

		len += snprintf(buf + len, PAGE_SIZE - len, "%s%s",

		len += snprintf(buf + len, PAGE_SIZE - len, "%s%s",

				len ? ", " : "", "flexible_inline_xattr");

				len ? ", " : "", "flexible_inline_xattr");

	if (f2fs_sb_has_quota_ino(sb))

		len += snprintf(buf + len, PAGE_SIZE - len, "%s%s",

				len ? ", " : "", "quota_ino");

	len += snprintf(buf + len, PAGE_SIZE - len, "\n");

	len += snprintf(buf + len, PAGE_SIZE - len, "\n");

	return len;

	return len;

}

}
@@ -227,6 +230,7 @@ enum feat_id { 
	FEAT_PROJECT_QUOTA,

	FEAT_PROJECT_QUOTA,

	FEAT_INODE_CHECKSUM,

	FEAT_INODE_CHECKSUM,

	FEAT_FLEXIBLE_INLINE_XATTR,

	FEAT_FLEXIBLE_INLINE_XATTR,

	FEAT_QUOTA_INO,

};

};





static ssize_t f2fs_feature_show(struct f2fs_attr *a,

static ssize_t f2fs_feature_show(struct f2fs_attr *a,
@@ -240,6 +244,7 @@ static ssize_t f2fs_feature_show(struct f2fs_attr *a, 
	case FEAT_PROJECT_QUOTA:

	case FEAT_PROJECT_QUOTA:

	case FEAT_INODE_CHECKSUM:

	case FEAT_INODE_CHECKSUM:

	case FEAT_FLEXIBLE_INLINE_XATTR:

	case FEAT_FLEXIBLE_INLINE_XATTR:

	case FEAT_QUOTA_INO:

		return snprintf(buf, PAGE_SIZE, "supported\n");

		return snprintf(buf, PAGE_SIZE, "supported\n");

	}

	}

	return 0;

	return 0;
@@ -314,6 +319,7 @@ F2FS_FEATURE_RO_ATTR(extra_attr, FEAT_EXTRA_ATTR); 
F2FS_FEATURE_RO_ATTR(project_quota, FEAT_PROJECT_QUOTA);

F2FS_FEATURE_RO_ATTR(project_quota, FEAT_PROJECT_QUOTA);

F2FS_FEATURE_RO_ATTR(inode_checksum, FEAT_INODE_CHECKSUM);

F2FS_FEATURE_RO_ATTR(inode_checksum, FEAT_INODE_CHECKSUM);

F2FS_FEATURE_RO_ATTR(flexible_inline_xattr, FEAT_FLEXIBLE_INLINE_XATTR);

F2FS_FEATURE_RO_ATTR(flexible_inline_xattr, FEAT_FLEXIBLE_INLINE_XATTR);

F2FS_FEATURE_RO_ATTR(quota_ino, FEAT_QUOTA_INO);





#define ATTR_LIST(name) (&f2fs_attr_##name.attr)

#define ATTR_LIST(name) (&f2fs_attr_##name.attr)

static struct attribute *f2fs_attrs[] = {

static struct attribute *f2fs_attrs[] = {
@@ -364,6 +370,7 @@ static struct attribute *f2fs_feat_attrs[] = { 
	ATTR_LIST(project_quota),

	ATTR_LIST(project_quota),

	ATTR_LIST(inode_checksum),

	ATTR_LIST(inode_checksum),

	ATTR_LIST(flexible_inline_xattr),

	ATTR_LIST(flexible_inline_xattr),

	ATTR_LIST(quota_ino),

	NULL,

	NULL,

};

};

include/linux/f2fs_fs.h

+5 −1
Original line number Original line Diff line number Diff line
@@ -36,6 +36,9 @@ 
#define F2FS_NODE_INO(sbi)	((sbi)->node_ino_num)

#define F2FS_NODE_INO(sbi)	((sbi)->node_ino_num)

#define F2FS_META_INO(sbi)	((sbi)->meta_ino_num)

#define F2FS_META_INO(sbi)	((sbi)->meta_ino_num)





#define F2FS_QUOTA_INO		3

#define F2FS_MAX_QUOTAS		3



#define F2FS_IO_SIZE(sbi)	(1 << (sbi)->write_io_size_bits) /* Blocks */

#define F2FS_IO_SIZE(sbi)	(1 << (sbi)->write_io_size_bits) /* Blocks */

#define F2FS_IO_SIZE_KB(sbi)	(1 << ((sbi)->write_io_size_bits + 2)) /* KB */

#define F2FS_IO_SIZE_KB(sbi)	(1 << ((sbi)->write_io_size_bits + 2)) /* KB */

#define F2FS_IO_SIZE_BYTES(sbi)	(1 << ((sbi)->write_io_size_bits + 12)) /* B */

#define F2FS_IO_SIZE_BYTES(sbi)	(1 << ((sbi)->write_io_size_bits + 12)) /* B */
@@ -108,7 +111,8 @@ struct f2fs_super_block { 
	__u8 encryption_level;		/* versioning level for encryption */

	__u8 encryption_level;		/* versioning level for encryption */

	__u8 encrypt_pw_salt[16];	/* Salt used for string2key algorithm */

	__u8 encrypt_pw_salt[16];	/* Salt used for string2key algorithm */

	struct f2fs_device devs[MAX_DEVICES];	/* device list */

	struct f2fs_device devs[MAX_DEVICES];	/* device list */

	__u8 reserved[327];		/* valid reserved region */

	__le32 qf_ino[F2FS_MAX_QUOTAS];	/* quota inode numbers */

	__u8 reserved[315];		/* valid reserved region */

} __packed;

} __packed;





/*

/*