From 6d5af2665963827903b8531d00071e6e4686c154 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 19 Oct 2009 11:41:51 -0700 Subject: [PATCH] --- yaml --- r: 188587 b: refs/heads/master c: ee7fdfaff7702bd209e3a013b2fc4643233f5465 h: refs/heads/master i: 188585: f26ba14c37be574c12295079dc6094ccc3bb1e3d 188583: a5e7ac77aba1fdbe5b28b5071626ad4260506ada v: v3 --- [refs] | 2 +- trunk/fs/ceph/ceph_fs.h | 2 +- trunk/fs/ceph/osdmap.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0c8026151f8d..a3f8c1bb77b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8fa9765576875200a7412a5300b5f0537211f038 +refs/heads/master: ee7fdfaff7702bd209e3a013b2fc4643233f5465 diff --git a/trunk/fs/ceph/ceph_fs.h b/trunk/fs/ceph/ceph_fs.h index 9b16e2e06ea6..f8f27e28a6bf 100644 --- a/trunk/fs/ceph/ceph_fs.h +++ b/trunk/fs/ceph/ceph_fs.h @@ -38,7 +38,7 @@ #define CEPH_OSD_PROTOCOL 7 /* cluster internal */ #define CEPH_MDS_PROTOCOL 9 /* cluster internal */ #define CEPH_MON_PROTOCOL 5 /* cluster internal */ -#define CEPH_OSDC_PROTOCOL 20 /* server/client */ +#define CEPH_OSDC_PROTOCOL 21 /* server/client */ #define CEPH_MDSC_PROTOCOL 29 /* server/client */ #define CEPH_MONC_PROTOCOL 15 /* server/client */ diff --git a/trunk/fs/ceph/osdmap.c b/trunk/fs/ceph/osdmap.c index 6f0aeff4185a..72d75a239ac2 100644 --- a/trunk/fs/ceph/osdmap.c +++ b/trunk/fs/ceph/osdmap.c @@ -791,6 +791,8 @@ int ceph_calc_object_layout(struct ceph_object_layout *ol, pgid.pg64 = 0; /* start with it zeroed out */ pgid.pg.ps = ceph_full_name_hash(oid, strlen(oid)); pgid.pg.preferred = preferred; + if (preferred >= 0) + pgid.pg.ps += preferred; pgid.pg.pool = le32_to_cpu(fl->fl_pg_pool); if (preferred >= 0) dout("calc_object_layout '%s' pgid %d.%xp%d (%llx)\n", oid,