ceph: make object hash a pg_pool property

The object will be hashed to a placement seed (ps) based on the pg_pool's
hash function.  This allows new hashes to be introduced into an existing
object store, or selection of a hash appropriate to the objects that
will be stored in a particular pool.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/ceph/osdmap.c b/fs/ceph/osdmap.c
index a025555..6847827 100644
--- a/fs/ceph/osdmap.c
+++ b/fs/ceph/osdmap.c
@@ -809,7 +809,7 @@ int ceph_calc_object_layout(struct ceph_object_layout *ol,
 		return -EIO;
 
 	pool = &osdmap->pg_pool[poolid];
-	ps = ceph_full_name_hash(oid, strlen(oid));
+	ps = ceph_str_hash(pool->v.object_hash, oid, strlen(oid));
 	if (preferred >= 0) {
 		ps += preferred;
 		num = le32_to_cpu(pool->v.lpg_num);