LU-5275 lprocfs: reduce scope of params_tree.h

[fs/lustre-release.git] / lnet / klnds / gnilnd / gnilnd_proc.c

diff --git a/lnet/klnds/gnilnd/gnilnd_proc.c b/lnet/klnds/gnilnd/gnilnd_proc.c
index e20fde9..52d0c3c 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd_proc.c
+++ b/lnet/klnds/gnilnd/gnilnd_proc.c
@@ -1,6 +1,8 @@
 /*
  * 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.
@@ -55,7 +57,7 @@ _kgnilnd_proc_run_cksum_test(int caseno, int nloops, int nob)
        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);
@@ -64,7 +66,7 @@ _kgnilnd_proc_run_cksum_test(int caseno, int nloops, int nob)
 
                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);
@@ -127,7 +129,7 @@ _kgnilnd_proc_run_cksum_test(int caseno, int nloops, int nob)
 
        getnstimeofday(&end);
 
-       mbytes = (nloops * nob * 2) / (1024*1024);
+       mbytes = ((__u64)nloops * nob * 2) / (1024*1024);
 
        diff = kgnilnd_ts_sub(end, begin);
 
@@ -214,6 +216,7 @@ kgnilnd_proc_stats_read(char *page, char **start, off_t off,
                           "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"
@@ -251,6 +254,7 @@ kgnilnd_proc_stats_read(char *page, char **start, off_t off,
                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,
@@ -687,14 +691,13 @@ static struct seq_operations kgn_smsg_sops = {
 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;
@@ -1028,14 +1031,13 @@ kgnilnd_proc_peer_conns_read(char *page, char **start, off_t off,
 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;
@@ -1252,14 +1254,13 @@ static struct seq_operations kgn_peer_sops = {
 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;