/*
* Copyright (C) 2009-2012 Cray, Inc.
*
+ * Copyright (c) 2013, Intel Corporation.
+ *
* Author: Nic Henke <nic@cray.com>
*
* This file is part of Lustre, http://www.lustre.org.
for (i = 0; i < LNET_MAX_IOV; i++) {
src[i].kiov_offset = 0;
src[i].kiov_len = PAGE_SIZE;
- src[i].kiov_page = alloc_page(__GFP_IO | __GFP_FS | __GFP_ZERO);
+ src[i].kiov_page = alloc_page(GFP_KERNEL | __GFP_ZERO);
if (src[i].kiov_page == NULL) {
CERROR("couldn't allocate page %d\n", i);
dest[i].kiov_offset = 0;
dest[i].kiov_len = PAGE_SIZE;
- dest[i].kiov_page = alloc_page(__GFP_IO | __GFP_FS | __GFP_ZERO);
+ dest[i].kiov_page = alloc_page(GFP_KERNEL | __GFP_ZERO);
if (dest[i].kiov_page == NULL) {
CERROR("couldn't allocate page %d\n", i);
getnstimeofday(&end);
- mbytes = (nloops * nob * 2) / (1024*1024);
+ mbytes = ((__u64)nloops * nob * 2) / (1024*1024);
diff = kgnilnd_ts_sub(end, begin);
"nfmablk: %d\n"
"n_mdd: %d\n"
"n_mdd_held: %d\n"
+ "n_eager_allocs: %d\n"
"GART map bytes: %ld\n"
"TX queued maps: %d\n"
"TX phys nmaps: %d\n"
atomic_read(&dev->gnd_ndgrams),
atomic_read(&dev->gnd_nfmablk),
atomic_read(&dev->gnd_n_mdd), atomic_read(&dev->gnd_n_mdd_held),
+ atomic_read(&kgnilnd_data.kgn_neager_allocs),
atomic64_read(&dev->gnd_nbytes_map),
atomic_read(&dev->gnd_nq_map),
dev->gnd_map_nphys, dev->gnd_map_physnop * PAGE_SIZE,
static int
kgnilnd_smsg_seq_open(struct inode *inode, struct file *file)
{
- struct proc_dir_entry *dp = PDE(inode);
struct seq_file *sf;
int rc;
rc = seq_open(file, &kgn_smsg_sops);
if (rc == 0) {
sf = file->private_data;
- sf->private = dp->data;
+ sf->private = PDE_DATA(inode);
}
return rc;
static int
kgnilnd_conn_seq_open(struct inode *inode, struct file *file)
{
- struct proc_dir_entry *dp = PDE(inode);
struct seq_file *sf;
int rc;
rc = seq_open(file, &kgn_conn_sops);
if (rc == 0) {
sf = file->private_data;
- sf->private = dp->data;
+ sf->private = PDE_DATA(inode);
}
return rc;
static int
kgnilnd_peer_seq_open(struct inode *inode, struct file *file)
{
- struct proc_dir_entry *dp = PDE(inode);
struct seq_file *sf;
int rc;
rc = seq_open(file, &kgn_peer_sops);
if (rc == 0) {
sf = file->private_data;
- sf->private = dp->data;
+ sf->private = PDE_DATA(inode);
}
return rc;