As the 'ceph help' print, it will print pgs.But now it can't.
So we add this.There are two type name of pg, temp and stable.
Because the command 'ceph pg dump' print temp name,so we also print the
temp name of pg.
Signed-off-by: Jianpeng Ma <majianpeng@xxxxxxxxx>
---
fs/ceph/ioctl.c | 10 +++++++++-
fs/ceph/ioctl.h | 1 +
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c
index e0b4ef3..1d0f24c 100644
--- a/fs/ceph/ioctl.c
+++ b/fs/ceph/ioctl.c
@@ -209,9 +209,17 @@ static long ceph_ioctl_get_dataloc(struct file *file, void __user *arg)
snprintf(dl.object_name, sizeof(dl.object_name), "%llx.%08llx",
ceph_ino(inode), dl.object_no);
+ r = ceph_calc_ceph_temp_pg(&pgid, dl.object_name, osdc->osdmap,
+ ceph_file_layout_pg_pool(ci->i_layout));
+ if (r < 0) {
+ down_read(&osdc->map_sem);
+ return r;
+ }
+ snprintf(dl.pg_name, sizeof(dl.pg_name), "%llx.%08x",
+ pgid.pool, pgid.seed);
+
ceph_calc_ceph_pg(&pgid, dl.object_name, osdc->osdmap,
ceph_file_layout_pg_pool(ci->i_layout));
-
dl.osd = ceph_calc_pg_primary(osdc->osdmap, pgid);
if (dl.osd >= 0) {
struct ceph_entity_addr *a =
diff --git a/fs/ceph/ioctl.h b/fs/ceph/ioctl.h
index c77028a..618eef2 100644
--- a/fs/ceph/ioctl.h
+++ b/fs/ceph/ioctl.h
@@ -58,6 +58,7 @@ struct ceph_ioctl_dataloc {
__u64 object_no; /* out: object # */
__u64 object_size; /* out: object size */
char object_name[64]; /* out: object name */
+ char pg_name[32]; /* out: pg name*/
__u64 block_offset; /* out: offset in block */
__u64 block_size; /* out: block length */
__s64 osd; /* out: osd # */
--
1.8.3.rc1.44.gb387c77
Thanks!
Jianpeng Ma?韬{.n?????%??檩??w?{.n????u朕?Ф?塄}?财??j:+v?? ? ???2??璀??摺?囤??z夸z罐?+?????w棹f
