diff options
| author |   Ilya Dryomov <idryomov@gmail.com> | 2017-01-31 15:55:06 +0100 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2017-02-20 12:16:11 +0100 |
| commit | 743efcffffc6620ab44ea9ec67c7e4e28dfa7742 (patch) | |
| tree | a087b21bd95308161d8b14269452efd1e798949d /include/linux/ceph | |
| parent | crush: remove mutable part of CRUSH map (diff) | |
| download | linux-dev-743efcffffc6620ab44ea9ec67c7e4e28dfa7742.tar.xz linux-dev-743efcffffc6620ab44ea9ec67c7e4e28dfa7742.zip | |
crush: merge working data and scratch
Much like Arlo Guthrie, I decided that one big pile is better than two
little piles.
Reflects ceph.git commit 95c2df6c7e0b22d2ea9d91db500cf8b9441c73ba.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'include/linux/ceph')
| -rw-r--r-- | include/linux/ceph/osdmap.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h index cef1cab789b9..8cebdc4158c3 100644 --- a/include/linux/ceph/osdmap.h +++ b/include/linux/ceph/osdmap.h @@ -173,8 +173,7 @@ struct ceph_osdmap { * the list of osds that store+replicate them. */ struct crush_map *crush; - struct mutex crush_scratch_mutex; - int crush_scratch_ary[CEPH_PG_MAX_SIZE * 3]; + struct mutex crush_workspace_mutex; void *crush_workspace; }; |