Commit 7740a42f authored by Sage Weil's avatar Sage Weil
Browse files

ceph: display pgid in debugfs osd request dump 



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

fs/ceph/debugfs.c

+4 −2
Original line number Diff line number Diff line
@@ -231,8 +231,10 @@ static int osdc_show(struct seq_file *s, void *pp) 


		req = rb_entry(p, struct ceph_osd_request, r_node);



		seq_printf(s, "%lld\tosd%d\t", req->r_tid,

			   req->r_osd ? req->r_osd->o_osd : -1);

		seq_printf(s, "%lld\tosd%d\t%d.%x\t", req->r_tid,

			   req->r_osd ? req->r_osd->o_osd : -1,

			   le32_to_cpu(req->r_pgid.pool),

			   le16_to_cpu(req->r_pgid.ps));



		head = req->r_request->front.iov_base;

		op = (void *)(head + 1);

fs/ceph/osd_client.c

+2 −0
Original line number Diff line number Diff line
@@ -538,6 +538,8 @@ static int __map_osds(struct ceph_osd_client *osdc, 
	if (err)

		return err;

	pgid = reqhead->layout.ol_pgid;

	req->r_pgid = pgid;



	o = ceph_calc_pg_primary(osdc->osdmap, pgid);



	if ((req->r_osd && req->r_osd->o_osd == o &&

fs/ceph/osd_client.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ struct ceph_osd_request { 
	struct rb_node  r_node;

	struct list_head r_osd_item;

	struct ceph_osd *r_osd;

	struct ceph_pg   r_pgid;



	struct ceph_connection *r_con_filling_pages;