Commit 79f6b11a authored by Namjae Jeon's avatar Namjae Jeon Committed by Steve French
Browse files

cifsd: remove wrappers of kvmalloc/kvfree 



Do directly call kvmalloc/kvfree().

Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 86f52978

fs/cifsd/auth.c

+1 −1
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ int ksmbd_krb5_authenticate(struct ksmbd_session *sess, char *in_blob, 
	*out_len = resp->spnego_blob_len;

	retval = 0;

out:

	ksmbd_free(resp);

	kvfree(resp);

	return retval;

}

#else

fs/cifsd/buffer_pool.c

+3 −33
Original line number Diff line number Diff line
@@ -37,16 +37,6 @@ struct wm_list { 
static LIST_HEAD(wm_lists);

static DEFINE_RWLOCK(wm_lists_lock);



void *ksmbd_alloc(size_t size)

{

	return kvmalloc(size, GFP_KERNEL | __GFP_ZERO);

}



void ksmbd_free(void *ptr)

{

	kvfree(ptr);

}



static struct wm *wm_alloc(size_t sz, gfp_t flags)

{

	struct wm *wm;
@@ -169,7 +159,7 @@ static void release_wm(struct wm *wm, struct wm_list *wm_list) 


	wm_list->avail_wm--;

	spin_unlock(&wm_list->wm_lock);

	ksmbd_free(wm);

	kvfree(wm);

}



static void wm_list_free(struct wm_list *l)
@@ -195,26 +185,6 @@ static void wm_lists_destroy(void) 
	}

}



void ksmbd_free_request(void *addr)

{

	kvfree(addr);

}



void *ksmbd_alloc_request(size_t size)

{

	return kvmalloc(size, GFP_KERNEL);

}



void ksmbd_free_response(void *buffer)

{

	kvfree(buffer);

}



void *ksmbd_alloc_response(size_t size)

{

	return kvmalloc(size, GFP_KERNEL | __GFP_ZERO);

}



void *ksmbd_find_buffer(size_t size)

{

	struct wm *wm;
@@ -247,11 +217,11 @@ void *ksmbd_realloc_response(void *ptr, size_t old_sz, size_t new_sz) 
	size_t sz = min(old_sz, new_sz);

	void *nptr;



	nptr = ksmbd_alloc_response(new_sz);

	nptr = kvmalloc(new_sz, GFP_KERNEL | __GFP_ZERO);

	if (!nptr)

		return ptr;

	memcpy(nptr, ptr, sz);

	ksmbd_free_response(ptr);

	kvfree(ptr);

	return nptr;

}

fs/cifsd/buffer_pool.h

+0 −8
Original line number Diff line number Diff line
@@ -9,14 +9,6 @@ 
void *ksmbd_find_buffer(size_t size);

void ksmbd_release_buffer(void *buffer);



void *ksmbd_alloc(size_t size);

void ksmbd_free(void *ptr);



void ksmbd_free_request(void *addr);

void *ksmbd_alloc_request(size_t size);

void ksmbd_free_response(void *buffer);

void *ksmbd_alloc_response(size_t size);



void *ksmbd_realloc_response(void *ptr, size_t old_sz, size_t new_sz);



void ksmbd_free_file_struct(void *filp);

fs/cifsd/connection.c

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ void ksmbd_conn_free(struct ksmbd_conn *conn) 
	list_del(&conn->conns_list);

	write_unlock(&conn_list_lock);



	ksmbd_free_request(conn->request_buf);

	kvfree(conn->request_buf);

	ksmbd_ida_free(conn->async_ida);

	kfree(conn->preauth_info);

	kfree(conn);
@@ -284,7 +284,7 @@ int ksmbd_conn_handler_loop(void *p) 
		if (try_to_freeze())

			continue;



		ksmbd_free_request(conn->request_buf);

		kvfree(conn->request_buf);

		conn->request_buf = NULL;



		size = t->ops->read(t, hdr_buf, sizeof(hdr_buf));
@@ -303,7 +303,7 @@ int ksmbd_conn_handler_loop(void *p) 


		/* 4 for rfc1002 length field */

		size = pdu_size + 4;

		conn->request_buf = ksmbd_alloc_request(size);

		conn->request_buf = kvmalloc(size, GFP_KERNEL);

		if (!conn->request_buf)

			continue;

fs/cifsd/crypto_ctx.c

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static struct shash_desc *alloc_shash_desc(int id) 


static struct ksmbd_crypto_ctx *ctx_alloc(void)

{

	return ksmbd_alloc(sizeof(struct ksmbd_crypto_ctx));

	return kzalloc(sizeof(struct ksmbd_crypto_ctx), GFP_KERNEL);

}



static void ctx_free(struct ksmbd_crypto_ctx *ctx)
@@ -116,7 +116,7 @@ static void ctx_free(struct ksmbd_crypto_ctx *ctx) 
		free_shash(ctx->desc[i]);

	for (i = 0; i < CRYPTO_AEAD_MAX; i++)

		free_aead(ctx->ccmaes[i]);

	ksmbd_free(ctx);

	kfree(ctx);

}



static struct ksmbd_crypto_ctx *ksmbd_find_crypto_ctx(void)