diff options
| author | Sage Weil <sage@newdream.net> | 2009-12-09 12:34:01 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2009-12-09 15:57:16 -0800 |
| commit | 767ea5c33a360ce88da24e296e802dace5821799 (patch) | |
| tree | ce2a9862093aec65cd8bd50764a325e053e4369b /fs/ceph | |
| parent | c2e552e76e2c6907ca50cd9a4b747a2e2e8c615e (diff) | |
ceph: do not feed bad device ids to crush
Do not feed bad (large) device ids to CRUSH.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/osdmap.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ceph/osdmap.c b/fs/ceph/osdmap.c index 8c994c71478..be5318aa771 100644 --- a/fs/ceph/osdmap.c +++ b/fs/ceph/osdmap.c @@ -868,6 +868,11 @@ static int *calc_pg_raw(struct ceph_osdmap *osdmap, struct ceph_pg pgid, ps = le16_to_cpu(pgid.ps); preferred = (s16)le16_to_cpu(pgid.preferred); + /* don't forcefeed bad device ids to crush */ + if (preferred >= osdmap->max_osd || + preferred >= osdmap->crush->max_devices) + preferred = -1; + if (poolid >= osdmap->num_pools) return NULL; pool = &osdmap->pg_pool[poolid]; |