pnfs: Add nfs_rpc_ops in calls to nfs_initiate_pgio
authorTom Haynes <loghyr@primarydata.com>
Mon, 9 Jun 2014 20:12:20 +0000 (13:12 -0700)
committerTom Haynes <loghyr@primarydata.com>
Tue, 3 Feb 2015 19:06:35 +0000 (11:06 -0800)
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
fs/nfs/filelayout/filelayout.c
fs/nfs/internal.h
fs/nfs/pagelist.c
fs/nfs/read.c
fs/nfs/write.c
include/linux/nfs_page.h

Simple merge
Simple merge
Simple merge
diff --cc fs/nfs/read.c
Simple merge
diff --cc fs/nfs/write.c
Simple merge
Simple merge