cifsd: use kmalloc() for small allocations

Just use kmalloc() for small allocations.

Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/cifsd/buffer_pool.c b/fs/cifsd/buffer_pool.c
index 864fea547c6899e4cbef2754e5aa799565ff8aa2..91c04879e9319337836e504bd964a585e091b9f5 100644 (file)
--- a/fs/cifsd/buffer_pool.c
+++ b/fs/cifsd/buffer_pool.c
@@ -63,7 +63,7 @@ static int register_wm_size_class(size_t sz)
 {
        struct wm_list *l, *nl;
 
-       nl = kvmalloc(sizeof(struct wm_list), GFP_KERNEL);
+       nl = kmalloc(sizeof(struct wm_list), GFP_KERNEL);
        if (!nl)
                return -ENOMEM;
 

diff --git a/fs/cifsd/mgmt/share_config.c b/fs/cifsd/mgmt/share_config.c
index 9bc7f7555ee2bae077af3be328dbc5c1dc74919e..db780febd692a474af193b30af745bd03eaaa85f 100644 (file)
--- a/fs/cifsd/mgmt/share_config.c
+++ b/fs/cifsd/mgmt/share_config.c
@@ -92,7 +92,7 @@ static int parse_veto_list(struct ksmbd_share_config *share,
        while (veto_list_sz > 0) {
                struct ksmbd_veto_pattern *p;
 
-               p = ksmbd_alloc(sizeof(struct ksmbd_veto_pattern));
+               p = kzalloc(sizeof(struct ksmbd_veto_pattern), GFP_KERNEL);
                if (!p)
                        return -ENOMEM;
 
@@ -129,7 +129,7 @@ static struct ksmbd_share_config *share_config_request(char *name)
        if (resp->flags == KSMBD_SHARE_FLAG_INVALID)
                goto out;
 
-       share = ksmbd_alloc(sizeof(struct ksmbd_share_config));
+       share = kzalloc(sizeof(struct ksmbd_share_config), GFP_KERNEL);
        if (!share)
                goto out;
 

diff --git a/fs/cifsd/mgmt/user_config.c b/fs/cifsd/mgmt/user_config.c
index a1a454bfb57b1aeed5a18b3a71dc3dbd78af5b46..f0c2f8994a6b83bb5d90f87c14cc1ecd7d97261a 100644 (file)
--- a/fs/cifsd/mgmt/user_config.c
+++ b/fs/cifsd/mgmt/user_config.c
@@ -31,7 +31,7 @@ struct ksmbd_user *ksmbd_alloc_user(struct ksmbd_login_response *resp)
 {
        struct ksmbd_user *user = NULL;
 
-       user = ksmbd_alloc(sizeof(struct ksmbd_user));
+       user = kmalloc(sizeof(struct ksmbd_user), GFP_KERNEL);
        if (!user)
                return NULL;
 
@@ -40,7 +40,7 @@ struct ksmbd_user *ksmbd_alloc_user(struct ksmbd_login_response *resp)
        user->gid = resp->gid;
        user->uid = resp->uid;
        user->passkey_sz = resp->hash_sz;
-       user->passkey = ksmbd_alloc(resp->hash_sz);
+       user->passkey = kmalloc(resp->hash_sz, GFP_KERNEL);
        if (user->passkey)
                memcpy(user->passkey, resp->hash, resp->hash_sz);
 

diff --git a/fs/cifsd/mgmt/user_session.c b/fs/cifsd/mgmt/user_session.c
index 1b71a20dacdb7e2a18720bbef60ffa77d78c6621..5a2113bf18ef27ae6d974c4a6fc0d48fbc58f339 100644 (file)
--- a/fs/cifsd/mgmt/user_session.c
+++ b/fs/cifsd/mgmt/user_session.c
@@ -101,7 +101,7 @@ int ksmbd_session_rpc_open(struct ksmbd_session *sess, char *rpc_name)
        if (!method)
                return -EINVAL;
 
-       entry = ksmbd_alloc(sizeof(struct ksmbd_session_rpc));
+       entry = kzalloc(sizeof(struct ksmbd_session_rpc), GFP_KERNEL);
        if (!entry)
                return -EINVAL;
 
@@ -266,7 +266,7 @@ static struct ksmbd_session *__session_create(int protocol)
        struct ksmbd_session *sess;
        int ret;
 
-       sess = ksmbd_alloc(sizeof(struct ksmbd_session));
+       sess = kzalloc(sizeof(struct ksmbd_session), GFP_KERNEL);
        if (!sess)
                return NULL;
 

diff --git a/fs/cifsd/oplock.c b/fs/cifsd/oplock.c
index 25823bb7d0865273affa15e989a13a1e14cd1b97..d76aa47e19e48363ee97b79dad0ccf88143ac004 100644 (file)
--- a/fs/cifsd/oplock.c
+++ b/fs/cifsd/oplock.c
@@ -593,7 +593,7 @@ static int oplock_break_pending(struct oplock_info *opinfo, int req_op_level)
 
 static inline int allocate_oplock_break_buf(struct ksmbd_work *work)
 {
-       work->response_buf = ksmbd_alloc_response(MAX_CIFS_SMALL_BUFFER_SIZE);
+       work->response_buf = kzalloc(MAX_CIFS_SMALL_BUFFER_SIZE, GFP_KERNEL);
        if (!work->response_buf)
                return -ENOMEM;
        work->response_sz = MAX_CIFS_SMALL_BUFFER_SIZE;

diff --git a/fs/cifsd/smb2pdu.c b/fs/cifsd/smb2pdu.c
index 460d5ba275bf1c3e88a870087b4d848283415eed..a1aa42b52597cc476d01f8e8f89d09dfb18f1e08 100644 (file)
--- a/fs/cifsd/smb2pdu.c
+++ b/fs/cifsd/smb2pdu.c
@@ -1174,7 +1174,7 @@ static int alloc_preauth_hash(struct ksmbd_session *sess,
        if (sess->Preauth_HashValue)
                return 0;
 
-       sess->Preauth_HashValue = ksmbd_alloc(PREAUTH_HASHVALUE_SIZE);
+       sess->Preauth_HashValue = kmalloc(PREAUTH_HASHVALUE_SIZE, GFP_KERNEL);
        if (!sess->Preauth_HashValue)
                return -ENOMEM;
 
@@ -8345,7 +8345,7 @@ int smb3_encrypt_resp(struct ksmbd_work *work)
        if (ARRAY_SIZE(iov) < rq_nvec)
                return -ENOMEM;
 
-       tr_hdr = ksmbd_alloc_response(sizeof(struct smb2_transform_hdr));
+       tr_hdr = kzalloc(sizeof(struct smb2_transform_hdr), GFP_KERNEL);
        if (!tr_hdr)
                return rc;
 

diff --git a/fs/cifsd/transport_tcp.c b/fs/cifsd/transport_tcp.c
index 359401227d93a3f455434a5e77a0ebdedb99ce5b..5dd8641f66ba4267efa75c79275f795516c6deca 100644 (file)
--- a/fs/cifsd/transport_tcp.c
+++ b/fs/cifsd/transport_tcp.c
@@ -569,7 +569,7 @@ static struct interface *alloc_iface(char *ifname)
        if (!ifname)
                return NULL;
 
-       iface = ksmbd_alloc(sizeof(struct interface));
+       iface = kzalloc(sizeof(struct interface), GFP_KERNEL);
        if (!iface) {
                kfree(ifname);
                return NULL;

diff --git a/fs/cifsd/vfs_cache.c b/fs/cifsd/vfs_cache.c
index 34e045f272304f3480911ae4fc10dbae9669698e..2b38628e1cb8a634a26fee6de9f728c61e7d2bbb 100644 (file)
--- a/fs/cifsd/vfs_cache.c
+++ b/fs/cifsd/vfs_cache.c
@@ -830,7 +830,7 @@ int ksmbd_file_table_flush(struct ksmbd_work *work)
 
 int ksmbd_init_file_table(struct ksmbd_file_table *ft)
 {
-       ft->idr = ksmbd_alloc(sizeof(struct idr));
+       ft->idr = kzalloc(sizeof(struct idr), GFP_KERNEL);
        if (!ft->idr)
                return -ENOMEM;