diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2015-06-12 17:48:46 +0200 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2015-06-15 17:13:40 +0200 |
| commit | 1db1abc8328d5cfc2de32e0f1c20a12295eae0b3 (patch) | |
| tree | e11237c7afea9741acb529ebc8287e8ec41b9147 /src/crush/crush.c | |
| parent | crush: add crush_compat.h (diff) | |
| download | ceph-1db1abc8328d5cfc2de32e0f1c20a12295eae0b3.tar.xz ceph-1db1abc8328d5cfc2de32e0f1c20a12295eae0b3.zip | |
crush: eliminate ad hoc diff between kernel and userspace
- map->choose_tries is not in the kernel
- 64-bit/64-bit in the kernel needs a special helper for 32-bit
architectures, crush_compat.h provides a stub
- INT64_MIN is not in the kernel, crush_compat.h provides S64_MIN
- use dprintk inside DEBUG_INDEP sections
No functional changes.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'src/crush/crush.c')
| -rw-r--r-- | src/crush/crush.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/crush/crush.c b/src/crush/crush.c index f3f7f6d4a15..80d7c3a97cb 100644 --- a/src/crush/crush.c +++ b/src/crush/crush.c @@ -130,7 +130,9 @@ void crush_destroy(struct crush_map *map) kfree(map->rules); } +#ifndef __KERNEL__ kfree(map->choose_tries); +#endif kfree(map); } |