commit 7740a42f816790583bd8a9079337772d511af3a3
author Sage Weil <sage@newdream.net> Fri Jan 08 15:58:25 2010 -0800
committer Sage Weil <sage@newdream.net> Thu Jan 14 12:23:39 2010 -0800
tree fffc12ba1ab1e60da8c13dba7fef5d0024278ca5
parent 103e2d3ae57d38d18aaac1b327266c1407499ac1

ceph: display pgid in debugfs osd request dump

Signed-off-by: Sage Weil <sage@newdream.net>

fs/ceph/debugfs.c

diff --git a/fs/ceph/debugfs.c b/fs/ceph/debugfs.c
index 22d3b47..fba44b2 100644
--- a/fs/ceph/debugfs.c
+++ b/fs/ceph/debugfs.c
@@ -231,8 +231,10 @@
 
 		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

diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c
index 80b868f..8417e21 100644
--- a/fs/ceph/osd_client.c
+++ b/fs/ceph/osd_client.c
@@ -538,6 +538,8 @@
 	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

diff --git a/fs/ceph/osd_client.h b/fs/ceph/osd_client.h
index 8fef71c..4162c68 100644
--- a/fs/ceph/osd_client.h
+++ b/fs/ceph/osd_client.h
@@ -42,6 +42,7 @@
 	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;