---

yaml --- r: 188677 b: refs/heads/master c: 7740a42 h: refs/heads/master i: 188675: a5abd54 v: v3
git-mirror · Jan 14, 2010 · e69c0f3 · e69c0f3
1 parent 5690e4f
commit e69c0f3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 103e2d3ae57d38d18aaac1b327266c1407499ac1
+refs/heads/master: 7740a42f816790583bd8a9079337772d511af3a3
diff --git a/trunk/fs/ceph/debugfs.c b/trunk/fs/ceph/debugfs.c
@@ -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);

diff --git a/trunk/fs/ceph/osd_client.c b/trunk/fs/ceph/osd_client.c
@@ -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 &&

diff --git a/trunk/fs/ceph/osd_client.h b/trunk/fs/ceph/osd_client.h
@@ -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;