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

Commit 32ab0bd7 authored by Sage Weil's avatar Sage Weil
Browse files

ceph: change ceph.file.layout.* implementation, content 



Implement a new method to generate the ceph.file.layout vxattr using
the new framework.

Use 'stripe_unit' instead of 'chunk_size'.

Include pool name, either as a string or as an integer.

Signed-off-by: default avatarSage Weil <sage@inktank.com>
Reviewed-by: default avatarSam Lang <sam.lang@inktank.com>
parent b65917dd

fs/ceph/xattr.c

+53 −14
Original line number Diff line number Diff line
@@ -33,6 +33,50 @@ struct ceph_vxattr { 
	bool (*exists_cb)(struct ceph_inode_info *ci);

};



/* layouts */



static bool ceph_vxattrcb_layout_exists(struct ceph_inode_info *ci)

{

	size_t s;

	char *p = (char *)&ci->i_layout;



	for (s = 0; s < sizeof(ci->i_layout); s++, p++)

		if (*p)

			return true;

	return false;

}



static size_t ceph_vxattrcb_layout(struct ceph_inode_info *ci, char *val,

					size_t size)

{

	int ret;

	struct ceph_fs_client *fsc = ceph_sb_to_client(ci->vfs_inode.i_sb);

	struct ceph_osd_client *osdc = &fsc->client->osdc;

	s64 pool = ceph_file_layout_pg_pool(ci->i_layout);

	const char *pool_name;



	dout("ceph_vxattrcb_layout %p\n", &ci->vfs_inode);

	down_read(&osdc->map_sem);

	pool_name = ceph_pg_pool_name_by_id(osdc->osdmap, pool);

	if (pool_name)

		ret = snprintf(val, size,

		"stripe_unit=%lld stripe_count=%lld object_size=%lld pool=%s",

		(unsigned long long)ceph_file_layout_su(ci->i_layout),

		(unsigned long long)ceph_file_layout_stripe_count(ci->i_layout),

	        (unsigned long long)ceph_file_layout_object_size(ci->i_layout),

		pool_name);

	else

		ret = snprintf(val, size,

		"stripe_unit=%lld stripe_count=%lld object_size=%lld pool=%lld",

		(unsigned long long)ceph_file_layout_su(ci->i_layout),

		(unsigned long long)ceph_file_layout_stripe_count(ci->i_layout),

	        (unsigned long long)ceph_file_layout_object_size(ci->i_layout),

		(unsigned long long)pool);



	up_read(&osdc->map_sem);

	return ret;

}



/* directories */



static size_t ceph_vxattrcb_dir_entries(struct ceph_inode_info *ci, char *val,
@@ -84,6 +128,7 @@ static size_t ceph_vxattrcb_dir_rctime(struct ceph_inode_info *ci, char *val, 
			(long)ci->i_rctime.tv_nsec);

}





#define CEPH_XATTR_NAME(_type, _name)	XATTR_CEPH_PREFIX #_type "." #_name



#define XATTR_NAME_CEPH(_type, _name)					\
@@ -111,21 +156,15 @@ static size_t ceph_dir_vxattrs_name_size; /* total size of all names */ 


/* files */



static size_t ceph_vxattrcb_file_layout(struct ceph_inode_info *ci, char *val,

				   size_t size)

{

	int ret;



	ret = snprintf(val, size,

		"chunk_bytes=%lld\nstripe_count=%lld\nobject_size=%lld\n",

		(unsigned long long)ceph_file_layout_su(ci->i_layout),

		(unsigned long long)ceph_file_layout_stripe_count(ci->i_layout),

		(unsigned long long)ceph_file_layout_object_size(ci->i_layout));

	return ret;

}



static struct ceph_vxattr ceph_file_vxattrs[] = {

	XATTR_NAME_CEPH(file, layout),

	{

		.name = "ceph.file.layout",

		.name_size = sizeof("ceph.file.layout"),

		.getxattr_cb = ceph_vxattrcb_layout,

		.readonly = false,

		.hidden = false,

		.exists_cb = ceph_vxattrcb_layout_exists,

	},

	{ 0 }	/* Required table terminator */

};

static size_t ceph_file_vxattrs_name_size;	/* total size of all names */