#define _LIBCFS_H
 
-void *libcfs_kvzalloc(size_t size, gfp_t flags);
-
 extern struct miscdevice libcfs_dev;
 /**
  * The path of debug log dump upcall script.
 
 libcfs-linux-objs += linux-module.o
 libcfs-linux-objs += linux-crypto.o
 libcfs-linux-objs += linux-crypto-adler.o
-libcfs-linux-objs += linux-mem.o
 
 libcfs-linux-objs := $(addprefix linux/,$(libcfs-linux-objs))
 
 
+++ /dev/null
-// SPDX-License-Identifier: GPL-2.0
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 only,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License version 2 for more details (a copy is included
- * in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see
- * http://www.gnu.org/licenses/gpl-2.0.html
- *
- */
-/*
- * This file creates a memory allocation primitive for Lustre, that
- * allows to fallback to vmalloc allocations should regular kernel allocations
- * fail due to size or system memory fragmentation.
- *
- * Author: Oleg Drokin <green@linuxhacker.ru>
- *
- */
-/*
- * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Seagate Technology.
- */
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-
-#include <linux/libcfs/libcfs.h>
-
-void *libcfs_kvzalloc(size_t size, gfp_t flags)
-{
-       void *ret;
-
-       ret = kzalloc(size, flags | __GFP_NOWARN);
-       if (!ret)
-               ret = __vmalloc(size, flags | __GFP_ZERO, PAGE_KERNEL);
-       return ret;
-}
-EXPORT_SYMBOL(libcfs_kvzalloc);
 
                goto out;
        }
 
-       lvbdata = libcfs_kvzalloc(lmmsize, GFP_NOFS);
+       lvbdata = kvzalloc(lmmsize, GFP_NOFS);
        if (!lvbdata) {
                rc = -ENOMEM;
                goto out;
 
                                reqlen = offsetof(typeof(*hur),
                                                  hur_user_item[nr])
                                         + hur->hur_request.hr_data_len;
-                               req = libcfs_kvzalloc(reqlen, GFP_NOFS);
+                               req = kvzalloc(reqlen, GFP_NOFS);
                                if (!req)
                                        return -ENOMEM;
 
                lsm_size = lmv_stripe_md_size(0);
 
        if (!lsm) {
-               lsm = libcfs_kvzalloc(lsm_size, GFP_NOFS);
+               lsm = kvzalloc(lsm_size, GFP_NOFS);
                if (!lsm)
                        return -ENOMEM;
                allocated = true;
 
        oinfo_ptrs_size = sizeof(struct lov_oinfo *) * stripe_count;
        lsm_size = sizeof(*lsm) + oinfo_ptrs_size;
 
-       lsm = libcfs_kvzalloc(lsm_size, GFP_NOFS);
+       lsm = kvzalloc(lsm_size, GFP_NOFS);
        if (!lsm)
                return NULL;
 
 
         * when writing a page. -jay
         */
        lio->lis_subs =
-               libcfs_kvzalloc(lsm->lsm_stripe_count *
+               kvzalloc(lsm->lsm_stripe_count *
                                sizeof(lio->lis_subs[0]),
                                GFP_NOFS);
        if (lio->lis_subs) {
 
                        nr++;
        }
        LASSERT(nr > 0);
-       lovlck = libcfs_kvzalloc(offsetof(struct lov_lock, lls_sub[nr]),
+       lovlck = kvzalloc(offsetof(struct lov_lock, lls_sub[nr]),
                                 GFP_NOFS);
        if (!lovlck)
                return ERR_PTR(-ENOMEM);
 
        r0->lo_nr  = lsm->lsm_stripe_count;
        LASSERT(r0->lo_nr <= lov_targets_nr(dev));
 
-       r0->lo_sub = libcfs_kvzalloc(r0->lo_nr * sizeof(r0->lo_sub[0]),
+       r0->lo_sub = kvzalloc(r0->lo_nr * sizeof(r0->lo_sub[0]),
                                     GFP_NOFS);
        if (r0->lo_sub) {
                int psz = 0;
        if (fiemap_count_to_size(fiemap->fm_extent_count) < buffer_size)
                buffer_size = fiemap_count_to_size(fiemap->fm_extent_count);
 
-       fm_local = libcfs_kvzalloc(buffer_size, GFP_NOFS);
+       fm_local = kvzalloc(buffer_size, GFP_NOFS);
        if (!fm_local) {
                rc = -ENOMEM;
                goto out;
 
        lmmk_size = lov_mds_md_size(stripe_count, lsm->lsm_magic);
 
 
-       lmmk = libcfs_kvzalloc(lmmk_size, GFP_NOFS);
+       lmmk = kvzalloc(lmmk_size, GFP_NOFS);
        if (!lmmk) {
                rc = -ENOMEM;
                goto out;
 
                LDLM_DEBUG(lock, "layout lock returned by: %s, lvb_len: %d",
                           ldlm_it2str(it->it_op), lvb_len);
 
-               lmm = libcfs_kvzalloc(lvb_len, GFP_NOFS);
+               lmm = kvzalloc(lvb_len, GFP_NOFS);
                if (!lmm) {
                        LDLM_LOCK_PUT(lock);
                        return -ENOMEM;
 
         * obdfilter-survey is an example, which relies on ioctl. So we'd
         * better avoid vmalloc on ioctl path. LU-66
         */
-       *buf = libcfs_kvzalloc(hdr.ioc_len, GFP_KERNEL);
+       *buf = kvzalloc(hdr.ioc_len, GFP_KERNEL);
        if (!*buf) {
                CERROR("Cannot allocate control buffer of len %d\n",
                       hdr.ioc_len);
 
        LASSERT(!handle->lgh_hdr);
 
        LASSERT(chunk_size >= LLOG_MIN_CHUNK_SIZE);
-       llh = libcfs_kvzalloc(sizeof(*llh), GFP_KERNEL);
+       llh = kvzalloc(sizeof(*llh), GFP_KERNEL);
        if (!llh)
                return -ENOMEM;
        handle->lgh_hdr = llh;
        /* expect chunk_size to be power of two */
        LASSERT(is_power_of_2(chunk_size));
 
-       buf = libcfs_kvzalloc(chunk_size, GFP_NOFS);
+       buf = kvzalloc(chunk_size, GFP_NOFS);
        if (!buf) {
                lpi->lpi_rc = -ENOMEM;
                return 0;
 
 
        LASSERT(!handle_hash);
 
-       handle_hash = libcfs_kvzalloc(sizeof(*bucket) * HANDLE_HASH_SIZE,
+       handle_hash = kvzalloc(sizeof(*bucket) * HANDLE_HASH_SIZE,
                                      GFP_KERNEL);
        if (!handle_hash)
                return -ENOMEM;
 
                req = ptlrpc_request_cache_alloc(GFP_KERNEL);
                if (!req)
                        return i;
-               msg = libcfs_kvzalloc(size, GFP_KERNEL);
+               msg = kvzalloc(size, GFP_KERNEL);
                if (!msg) {
                        ptlrpc_request_cache_free(req);
                        return i;
 
        /* save request message */
        reqmsg_size = req->rq_reqlen;
        if (reqmsg_size != 0) {
-               reqmsg = libcfs_kvzalloc(reqmsg_size, GFP_NOFS);
+               reqmsg = kvzalloc(reqmsg_size, GFP_NOFS);
                if (!reqmsg)
                        return -ENOMEM;
                memcpy(reqmsg, req->rq_reqmsg, reqmsg_size);
 
        early_size = req->rq_nob_received;
        early_bufsz = size_roundup_power2(early_size);
-       early_buf = libcfs_kvzalloc(early_bufsz, GFP_NOFS);
+       early_buf = kvzalloc(early_bufsz, GFP_NOFS);
        if (!early_buf) {
                rc = -ENOMEM;
                goto err_req;
 
 {
        LASSERT(page_pools.epp_max_pools);
        page_pools.epp_pools =
-               libcfs_kvzalloc(page_pools.epp_max_pools *
+               kvzalloc(page_pools.epp_max_pools *
                                sizeof(*page_pools.epp_pools),
                                GFP_NOFS);
 }
 
                int alloc_size = size_roundup_power2(msgsize);
 
                LASSERT(!req->rq_pool);
-               req->rq_reqbuf = libcfs_kvzalloc(alloc_size, GFP_NOFS);
+               req->rq_reqbuf = kvzalloc(alloc_size, GFP_NOFS);
                if (!req->rq_reqbuf)
                        return -ENOMEM;
 
 
        msgsize = size_roundup_power2(msgsize);
 
-       req->rq_repbuf = libcfs_kvzalloc(msgsize, GFP_NOFS);
+       req->rq_repbuf = kvzalloc(msgsize, GFP_NOFS);
        if (!req->rq_repbuf)
                return -ENOMEM;
 
        if (req->rq_reqbuf_len < newmsg_size) {
                alloc_size = size_roundup_power2(newmsg_size);
 
-               newbuf = libcfs_kvzalloc(alloc_size, GFP_NOFS);
+               newbuf = kvzalloc(alloc_size, GFP_NOFS);
                if (!newbuf)
                        return -ENOMEM;
 
                /* pre-allocated */
                LASSERT(rs->rs_size >= rs_size);
        } else {
-               rs = libcfs_kvzalloc(rs_size, GFP_NOFS);
+               rs = kvzalloc(rs_size, GFP_NOFS);
                if (!rs)
                        return -ENOMEM;
 
 
                LASSERT(!req->rq_pool);
 
                alloc_len = size_roundup_power2(alloc_len);
-               req->rq_reqbuf = libcfs_kvzalloc(alloc_len, GFP_NOFS);
+               req->rq_reqbuf = kvzalloc(alloc_len, GFP_NOFS);
                if (!req->rq_reqbuf)
                        return -ENOMEM;
 
 
        alloc_len = size_roundup_power2(alloc_len);
 
-       req->rq_repbuf = libcfs_kvzalloc(alloc_len, GFP_NOFS);
+       req->rq_repbuf = kvzalloc(alloc_len, GFP_NOFS);
        if (!req->rq_repbuf)
                return -ENOMEM;
 
        if (req->rq_reqbuf_len < newbuf_size) {
                newbuf_size = size_roundup_power2(newbuf_size);
 
-               newbuf = libcfs_kvzalloc(newbuf_size, GFP_NOFS);
+               newbuf = kvzalloc(newbuf_size, GFP_NOFS);
                if (!newbuf)
                        return -ENOMEM;
 
                /* pre-allocated */
                LASSERT(rs->rs_size >= rs_size);
        } else {
-               rs = libcfs_kvzalloc(rs_size, GFP_NOFS);
+               rs = kvzalloc(rs_size, GFP_NOFS);
                if (!rs)
                        return -ENOMEM;
 
 
        reqcopy = ptlrpc_request_cache_alloc(GFP_NOFS);
        if (!reqcopy)
                return -ENOMEM;
-       reqmsg = libcfs_kvzalloc(req->rq_reqlen, GFP_NOFS);
+       reqmsg = kvzalloc(req->rq_reqlen, GFP_NOFS);
        if (!reqmsg) {
                rc = -ENOMEM;
                goto out_free;
        }
 
        /* Alloc reply state structure for this one */
-       rs = libcfs_kvzalloc(svc->srv_max_reply_size, GFP_NOFS);
+       rs = kvzalloc(svc->srv_max_reply_size, GFP_NOFS);
        if (!rs) {
                rc = -ENOMEM;
                goto out_srv_fini;