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

Commit a8b763a9 authored by Sage Weil's avatar Sage Weil
Browse files

ceph: use %pU to print uuid (fsid) 



Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent f0b18d9f

fs/ceph/debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -361,8 +361,8 @@ int ceph_debugfs_client_init(struct ceph_client *client) 
	int ret = 0;

	char name[80];



	snprintf(name, sizeof(name), FSID_FORMAT ".client%lld",

		 PR_FSID(&client->fsid), client->monc.auth->global_id);

	snprintf(name, sizeof(name), "%pU.client%lld", &client->fsid,

		 client->monc.auth->global_id);



	client->debugfs_dir = debugfs_create_dir(name, ceph_debugfs_dir);

	if (!client->debugfs_dir)

fs/ceph/super.c

+6 −6
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static int ceph_show_options(struct seq_file *m, struct vfsmount *mnt) 
	struct ceph_mount_args *args = client->mount_args;



	if (args->flags & CEPH_OPT_FSID)

		seq_printf(m, ",fsid=" FSID_FORMAT, PR_FSID(&args->fsid));

		seq_printf(m, ",fsid=%pU", &args->fsid);

	if (args->flags & CEPH_OPT_NOSHARE)

		seq_puts(m, ",noshare");

	if (args->flags & CEPH_OPT_DIRSTAT)
@@ -408,7 +408,7 @@ static int parse_fsid(const char *str, struct ceph_fsid *fsid) 


	if (i == 16)

		err = 0;

	dout("parse_fsid ret %d got fsid " FSID_FORMAT, err, PR_FSID(fsid));

	dout("parse_fsid ret %d got fsid %pU", err, fsid);

	return err;

}
@@ -727,13 +727,13 @@ int ceph_check_fsid(struct ceph_client *client, struct ceph_fsid *fsid) 
{

	if (client->have_fsid) {

		if (ceph_fsid_compare(&client->fsid, fsid)) {

			pr_err("bad fsid, had " FSID_FORMAT " got " FSID_FORMAT,

			       PR_FSID(&client->fsid), PR_FSID(fsid));

			pr_err("bad fsid, had %pU got %pU",

			       &client->fsid, fsid);

			return -1;

		}

	} else {

		pr_info("client%lld fsid " FSID_FORMAT "\n",

			client->monc.auth->global_id, PR_FSID(fsid));

		pr_info("client%lld fsid %pU\n", client->monc.auth->global_id,

			fsid);

		memcpy(&client->fsid, fsid, sizeof(*fsid));

		ceph_debugfs_client_init(client);

		client->have_fsid = true;

fs/ceph/super.h

+0 −7
Original line number Diff line number Diff line
@@ -746,13 +746,6 @@ extern struct kmem_cache *ceph_file_cachep; 
extern const char *ceph_msg_type_name(int type);

extern int ceph_check_fsid(struct ceph_client *client, struct ceph_fsid *fsid);



#define FSID_FORMAT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-" \

	"%02x%02x%02x%02x%02x%02x"

#define PR_FSID(f) (f)->fsid[0], (f)->fsid[1], (f)->fsid[2], (f)->fsid[3], \

		(f)->fsid[4], (f)->fsid[5], (f)->fsid[6], (f)->fsid[7],    \

		(f)->fsid[8], (f)->fsid[9], (f)->fsid[10], (f)->fsid[11],  \

		(f)->fsid[12], (f)->fsid[13], (f)->fsid[14], (f)->fsid[15]



/* inode.c */

extern const struct inode_operations ceph_file_iops;