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

Commit 08796873 authored by Yan, Zheng's avatar Yan, Zheng Committed by Ilya Dryomov
Browse files

ceph: support getting ceph.dir.pin vxattr 

Link: http://tracker.ceph.com/issues/37576


Signed-off-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent b37fe1f9

fs/ceph/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -877,6 +877,7 @@ static int fill_inode(struct inode *inode, struct page *locked_page, 
			ci->i_rbytes = le64_to_cpu(info->rbytes);

			ci->i_rfiles = le64_to_cpu(info->rfiles);

			ci->i_rsubdirs = le64_to_cpu(info->rsubdirs);

			ci->i_dir_pin = iinfo->dir_pin;

			ceph_decode_timespec64(&ci->i_rctime, &info->rctime);

		}

	}

fs/ceph/mds_client.c

+9 −0
Original line number Diff line number Diff line
@@ -157,6 +157,13 @@ static int parse_reply_info_in(void **p, void *end, 
			ceph_decode_64_safe(p, end, change_attr, bad);

		}



		/* dir pin */

		if (struct_v >= 2) {

			ceph_decode_32_safe(p, end, info->dir_pin, bad);

		} else {

			info->dir_pin = -ENODATA;

		}



		*p = end;

	} else {

		if (features & CEPH_FEATURE_MDS_INLINE_DATA) {
@@ -187,6 +194,8 @@ static int parse_reply_info_in(void **p, void *end, 
				*p += info->pool_ns_len;

			}

		}



		info->dir_pin = -ENODATA;

	}

	return 0;

bad:

fs/ceph/mds_client.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ struct ceph_mds_reply_info_in { 
	char *pool_ns_data;

	u64 max_bytes;

	u64 max_files;

	s32 dir_pin;

};



struct ceph_mds_reply_dir_entry {

fs/ceph/super.h

+2 −0
Original line number Diff line number Diff line
@@ -318,6 +318,8 @@ struct ceph_inode_info { 
	/* quotas */

	u64 i_max_bytes, i_max_files;



	s32 i_dir_pin;



	struct rb_root i_fragtree;

	int i_fragtree_nsplits;

	struct mutex i_fragtree_mutex;

fs/ceph/xattr.c

+19 −1
Original line number Diff line number Diff line
@@ -228,8 +228,19 @@ static size_t ceph_vxattrcb_dir_rctime(struct ceph_inode_info *ci, char *val, 
			ci->i_rctime.tv_nsec);

}



/* quotas */

/* dir pin */

static bool ceph_vxattrcb_dir_pin_exists(struct ceph_inode_info *ci)

{

	return ci->i_dir_pin != -ENODATA;

}



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

                                    size_t size)

{

	return snprintf(val, size, "%d", (int)ci->i_dir_pin);

}



/* quotas */

static bool ceph_vxattrcb_quota_exists(struct ceph_inode_info *ci)

{

	bool ret = false;
@@ -314,6 +325,13 @@ static struct ceph_vxattr ceph_dir_vxattrs[] = { 
	XATTR_RSTAT_FIELD(dir, rsubdirs),

	XATTR_RSTAT_FIELD(dir, rbytes),

	XATTR_RSTAT_FIELD(dir, rctime),

	{

		.name = "ceph.dir.pin",

		.name_size = sizeof("ceph.dir_pin"),

		.getxattr_cb = ceph_vxattrcb_dir_pin,

		.exists_cb = ceph_vxattrcb_dir_pin_exists,

		.flags = VXATTR_FLAG_HIDDEN,

	},

	{

		.name = "ceph.quota",

		.name_size = sizeof("ceph.quota"),