diff options
| author | Ilya Dryomov <ilya.dryomov@inktank.com> | 2014-03-24 17:12:48 +0200 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2014-04-04 21:08:14 -0700 |
| commit | 8008ab1080c1768b02d232dcfd9e161cd47cc9f7 (patch) | |
| tree | a1f59c1f607a9e118a7047be73b7f93e4195d32e /net/ceph/osd_client.c | |
| parent | ac972230e20581b044f5ce66dcaf3c5af8d57444 (diff) | |
| download | linux-8008ab1080c1768b02d232dcfd9e161cd47cc9f7.tar.gz linux-8008ab1080c1768b02d232dcfd9e161cd47cc9f7.tar.bz2 linux-8008ab1080c1768b02d232dcfd9e161cd47cc9f7.zip | |
libceph: return primary from ceph_calc_pg_acting()
In preparation for adding support for primary_temp, stop assuming
primaryness: add a primary out parameter to ceph_calc_pg_acting() and
change call sites accordingly. Primary is now specified separately
from the order of osds in the set.
Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'net/ceph/osd_client.c')
| -rw-r--r-- | net/ceph/osd_client.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 6f64eec18851..b4157dc22199 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1333,7 +1333,7 @@ static int __map_request(struct ceph_osd_client *osdc, { struct ceph_pg pgid; int acting[CEPH_PG_MAX_SIZE]; - int o = -1, num = 0; + int num, o; int err; bool was_paused; @@ -1346,11 +1346,9 @@ static int __map_request(struct ceph_osd_client *osdc, } req->r_pgid = pgid; - err = ceph_calc_pg_acting(osdc->osdmap, pgid, acting); - if (err > 0) { - o = acting[0]; - num = err; - } + num = ceph_calc_pg_acting(osdc->osdmap, pgid, acting, &o); + if (num < 0) + num = 0; was_paused = req->r_paused; req->r_paused = __req_should_be_paused(osdc, req); |