openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ceph: display pgid in debugfs osd request dump 

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2010-01-08 15:58:25 -08:00
parent 103e2d3ae5
commit 7740a42f81
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/ceph/debugfs.c
View File

@ -231,8 +231,10 @@ static int osdc_show(struct seq_file *s, void *pp)
req = rb_entry(p, struct ceph_osd_request, r_node); req = rb_entry(p, struct ceph_osd_request, r_node);
seq_printf(s, "%lld\tosd%d\t", req->r_tid, seq_printf(s, "%lld\tosd%d\t%d.%x\t", req->r_tid,
req->r_osd ? req->r_osd->o_osd : -1); 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; head = req->r_request->front.iov_base;
op = (void *)(head + 1); op = (void *)(head + 1);

2
fs/ceph/osd_client.c
View File

@ -538,6 +538,8 @@ static int __map_osds(struct ceph_osd_client *osdc,
if (err) if (err)
return err; return err;
pgid = reqhead->layout.ol_pgid; pgid = reqhead->layout.ol_pgid;
req->r_pgid = pgid;
o = ceph_calc_pg_primary(osdc->osdmap, pgid); o = ceph_calc_pg_primary(osdc->osdmap, pgid);
if ((req->r_osd && req->r_osd->o_osd == o && if ((req->r_osd && req->r_osd->o_osd == o &&

1
fs/ceph/osd_client.h
View File

@ -42,6 +42,7 @@ struct ceph_osd_request {
struct rb_node r_node; struct rb_node r_node;
struct list_head r_osd_item; struct list_head r_osd_item;
struct ceph_osd *r_osd; struct ceph_osd *r_osd;
struct ceph_pg r_pgid;
struct ceph_connection *r_con_filling_pages; struct ceph_connection *r_con_filling_pages;