From cd91d9061451edbcdba30315060bb4878aadae23 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 7 Jan 2008 18:02:38 -0800 Subject: [PATCH] fixed prepare_pages, osd_client bugs --- src/kernel/messenger.c | 2 +- src/kernel/osdmap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c index 5e4530e0d822d..603aa7aa6e701 100644 --- a/src/kernel/messenger.c +++ b/src/kernel/messenger.c @@ -597,7 +597,7 @@ static int read_message_partial(struct ceph_connection *con) want = calc_pages_for(m->hdr.data_len, m->hdr.data_off); ret = 0; BUG_ON(!con->msgr->prepare_pages); - ret = con->msgr->prepare_pages(con->msgr, m, want); + ret = con->msgr->prepare_pages(con->msgr->parent, m, want); if (ret < 0) { dout(10, "prepare_pages failed, skipping+discarding message\n"); con->in_base_pos = -m->hdr.data_len; /* ignore rest of message */ diff --git a/src/kernel/osdmap.c b/src/kernel/osdmap.c index e7273ba08a3f5..b620db9b31acb 100644 --- a/src/kernel/osdmap.c +++ b/src/kernel/osdmap.c @@ -534,7 +534,7 @@ void calc_object_layout(struct ceph_object_layout *ol, struct ceph_osdmap *osdmap) { unsigned num, num_mask; - if (fl->fl_pg_preferred) { + if (fl->fl_pg_preferred >= 0) { num = osdmap->localized_pg_num; num_mask = osdmap->localized_pg_num_mask; } else { -- 2.39.5