diff options
| author | Trond Myklebust | 2014-11-26 23:27:43 +0100 |
|---|---|---|
| committer | Trond Myklebust | 2014-11-26 23:34:14 +0100 |
| commit | 1702562db4bf6d43f60c2263ac7bec1f58d49c33 (patch) | |
| tree | b971f0d7a20451ed3560389c15971019376445c7 /include/linux/sunrpc | |
| parent | nfs: Add DEALLOCATE support (diff) | |
| parent | NFS: Clean up nfs4_init_callback() (diff) | |
| download | kernel-qcow2-linux-1702562db4bf6d43f60c2263ac7bec1f58d49c33.tar.gz kernel-qcow2-linux-1702562db4bf6d43f60c2263ac7bec1f58d49c33.tar.xz kernel-qcow2-linux-1702562db4bf6d43f60c2263ac7bec1f58d49c33.zip | |
Merge tag 'nfs-cel-for-3.19' of git://git.linux-nfs.org/projects/anna/nfs-rdma into linux-next
Pull pull additional NFS client changes for 3.19 from Anna Schumaker:
"NFS: Generic client side changes from Chuck
These patches fixes for iostats and SETCLIENTID in addition to cleaning
up the nfs4_init_callback() function.
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>"
* tag 'nfs-cel-for-3.19' of git://git.linux-nfs.org/projects/anna/nfs-rdma:
NFS: Clean up nfs4_init_callback()
NFS: SETCLIENTID XDR buffer sizes are incorrect
SUNRPC: serialize iostats updates
Diffstat (limited to 'include/linux/sunrpc')
| -rw-r--r-- | include/linux/sunrpc/metrics.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/sunrpc/metrics.h b/include/linux/sunrpc/metrics.h index 1565bbe86d51..eecb5a71e6c0 100644 --- a/include/linux/sunrpc/metrics.h +++ b/include/linux/sunrpc/metrics.h @@ -27,10 +27,13 @@ #include <linux/seq_file.h> #include <linux/ktime.h> +#include <linux/spinlock.h> #define RPC_IOSTATS_VERS "1.0" struct rpc_iostats { + spinlock_t om_lock; + /* * These counters give an idea about how many request * transmissions are required, on average, to complete that |