diff options
| author | Peng Tao <bergwolf@gmail.com> | 2013-06-03 21:58:22 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-03 11:32:51 -0700 |
| commit | 49c02a75708457b629bba47aed0ba28b2cabf4a1 (patch) | |
| tree | d23494acfdb392db757adab317c5d8f818f43fe2 /drivers/staging/lustre/lnet | |
| parent | c3dbb7812d21e04995c34c1a1a5e0e8262896d5f (diff) | |
staging/lustre: clean up and remove libcfs/linux/linux-mem.c
Those are simple wrappers for numa allocator. We don't need them.
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lnet')
| -rw-r--r-- | drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 5 | ||||
| -rw-r--r-- | drivers/staging/lustre/lnet/lnet/router.c | 5 | ||||
| -rw-r--r-- | drivers/staging/lustre/lnet/selftest/rpc.c | 3 |
3 files changed, 8 insertions, 5 deletions
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c index f4b958bbe5a..221d37311ca 100644 --- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c +++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c @@ -1203,8 +1203,9 @@ kiblnd_alloc_pages(kib_pages_t **pp, int cpt, int npages) p->ibp_npages = npages; for (i = 0; i < npages; i++) { - p->ibp_pages[i] = cfs_page_cpt_alloc(lnet_cpt_table(), cpt, - __GFP_IO); + p->ibp_pages[i] = alloc_pages_node( + cfs_cpt_spread_node(lnet_cpt_table(), cpt), + __GFP_IO, 0); if (p->ibp_pages[i] == NULL) { CERROR("Can't allocate page %d of %d\n", i, npages); kiblnd_free_pages(p); diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c index c5ff97aaacc..a326ce06bc7 100644 --- a/drivers/staging/lustre/lnet/lnet/router.c +++ b/drivers/staging/lustre/lnet/lnet/router.c @@ -1247,8 +1247,9 @@ lnet_new_rtrbuf(lnet_rtrbufpool_t *rbp, int cpt) rb->rb_pool = rbp; for (i = 0; i < npages; i++) { - page = cfs_page_cpt_alloc(lnet_cpt_table(), cpt, - __GFP_ZERO | GFP_IOFS); + page = alloc_pages_node( + cfs_cpt_spread_node(lnet_cpt_table(), cpt), + __GFP_ZERO | GFP_IOFS, 0); if (page == NULL) { while (--i >= 0) __free_page(rb->rb_kiov[i].kiov_page); diff --git a/drivers/staging/lustre/lnet/selftest/rpc.c b/drivers/staging/lustre/lnet/selftest/rpc.c index 91d83f4b746..bc1f38b8048 100644 --- a/drivers/staging/lustre/lnet/selftest/rpc.c +++ b/drivers/staging/lustre/lnet/selftest/rpc.c @@ -146,7 +146,8 @@ srpc_alloc_bulk(int cpt, unsigned bulk_npg, unsigned bulk_len, int sink) struct page *pg; int nob; - pg = cfs_page_cpt_alloc(lnet_cpt_table(), cpt, GFP_IOFS); + pg = alloc_pages_node(cfs_cpt_spread_node(lnet_cpt_table(), cpt), + GFP_IOFS, 0); if (pg == NULL) { CERROR("Can't allocate page %d of %d\n", i, bulk_npg); srpc_free_bulk(bk); |