Commit dc31f99b authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman

staging: lustre: use kmalloc for allocating ksock_tx

The size of the data structure is primarily controlled
by the iovec size, which is limited to 256.
Entries in this vector are 12 bytes, so the whole
will always fit in a page.
So it is safe to use kmalloc (kvmalloc not needed).
So replace LIBCFS_ALLOC with kmalloc.
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db1e7806
...@@ -2282,7 +2282,7 @@ ksocknal_free_buffers(void) ...@@ -2282,7 +2282,7 @@ ksocknal_free_buffers(void)
list_for_each_entry_safe(tx, temp, &zlist, tx_list) { list_for_each_entry_safe(tx, temp, &zlist, tx_list) {
list_del(&tx->tx_list); list_del(&tx->tx_list);
LIBCFS_FREE(tx, tx->tx_desc_size); kfree(tx);
} }
} else { } else {
spin_unlock(&ksocknal_data.ksnd_tx_lock); spin_unlock(&ksocknal_data.ksnd_tx_lock);
......
...@@ -46,7 +46,7 @@ ksocknal_alloc_tx(int type, int size) ...@@ -46,7 +46,7 @@ ksocknal_alloc_tx(int type, int size)
} }
if (!tx) if (!tx)
LIBCFS_ALLOC(tx, size); tx = kzalloc(size, GFP_NOFS);
if (!tx) if (!tx)
return NULL; return NULL;
...@@ -102,7 +102,7 @@ ksocknal_free_tx(struct ksock_tx *tx) ...@@ -102,7 +102,7 @@ ksocknal_free_tx(struct ksock_tx *tx)
spin_unlock(&ksocknal_data.ksnd_tx_lock); spin_unlock(&ksocknal_data.ksnd_tx_lock);
} else { } else {
LIBCFS_FREE(tx, tx->tx_desc_size); kfree(tx);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment