NFS: Revert pnfs ugliness from the generic NFS read code path
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 10 Nov 2011 19:30:37 +0000 (14:30 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 10 Nov 2011 19:50:26 +0000 (14:50 -0500)
pNFS-specific code belongs in the pnfs layer. It should not be
hijacking generic NFS read or write code paths.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/internal.h
fs/nfs/pnfs.c
fs/nfs/read.c

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