diff options
author | Ilya Dryomov <idryomov@redhat.com> | 2014-10-23 08:32:57 -0400 |
---|---|---|
committer | Ilya Dryomov <idryomov@redhat.com> | 2014-12-17 12:09:50 -0500 |
commit | 4965fc38c460b274b2a1789e1165a25fb0409d7e (patch) | |
tree | 540d27c966a31b6e6f5a21bd44608e3edf3d1646 /include/linux | |
parent | 9280be24dc9c7aaee230de3ed33f8357386de9a2 (diff) |
libceph: nuke ceph_kvfree()
Use kvfree() from linux/mm.h instead, which is identical. Also fix the
ceph_buffer comment: we will allocate with kmalloc() up to 32k - the
value of PAGE_ALLOC_COSTLY_ORDER, but that really is just an
implementation detail so don't mention it at all.
Signed-off-by: Ilya Dryomov <idryomov@redhat.com>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/ceph/buffer.h | 3 | ||||
-rw-r--r-- | include/linux/ceph/libceph.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/ceph/buffer.h b/include/linux/ceph/buffer.h index 07ad423cc37f..07ca15e76100 100644 --- a/include/linux/ceph/buffer.h +++ b/include/linux/ceph/buffer.h | |||
@@ -10,8 +10,7 @@ | |||
10 | /* | 10 | /* |
11 | * a simple reference counted buffer. | 11 | * a simple reference counted buffer. |
12 | * | 12 | * |
13 | * use kmalloc for small sizes (<= one page), vmalloc for larger | 13 | * use kmalloc for smaller sizes, vmalloc for larger sizes. |
14 | * sizes. | ||
15 | */ | 14 | */ |
16 | struct ceph_buffer { | 15 | struct ceph_buffer { |
17 | struct kref kref; | 16 | struct kref kref; |
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h index 07bc359b88ac..d293f7e38814 100644 --- a/include/linux/ceph/libceph.h +++ b/include/linux/ceph/libceph.h | |||
@@ -184,7 +184,6 @@ extern bool libceph_compatible(void *data); | |||
184 | extern const char *ceph_msg_type_name(int type); | 184 | extern const char *ceph_msg_type_name(int type); |
185 | extern int ceph_check_fsid(struct ceph_client *client, struct ceph_fsid *fsid); | 185 | extern int ceph_check_fsid(struct ceph_client *client, struct ceph_fsid *fsid); |
186 | extern void *ceph_kvmalloc(size_t size, gfp_t flags); | 186 | extern void *ceph_kvmalloc(size_t size, gfp_t flags); |
187 | extern void ceph_kvfree(const void *ptr); | ||
188 | 187 | ||
189 | extern struct ceph_options *ceph_parse_options(char *options, | 188 | extern struct ceph_options *ceph_parse_options(char *options, |
190 | const char *dev_name, const char *dev_name_end, | 189 | const char *dev_name, const char *dev_name_end, |