summaryrefslogtreecommitdiffstats
path: root/fs/nfs/Makefile
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2013-08-09 18:48:44 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2013-09-03 21:26:33 +0200
commit9d33059c1b76d77004753799479af6d359d83217 (patch)
tree884157e2098dbeb4f57c6caa830e18b6c06ed11c /fs/nfs/Makefile
parentNFS: Remove unused call_sync minor version op (diff)
downloadlinux-9d33059c1b76d77004753799479af6d359d83217.tar.xz
linux-9d33059c1b76d77004753799479af6d359d83217.zip
NFS: Enable slot table helpers for NFSv4.0
I'd like to re-use NFSv4.1's slot table machinery for NFSv4.0 transport blocking. Re-organize some of nfs4session.c so the slot table code is built even when NFS_V4_1 is disabled. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/Makefile')
-rw-r--r--fs/nfs/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfs/Makefile b/fs/nfs/Makefile
index 7238c4b4c70c..03192a66c143 100644
--- a/fs/nfs/Makefile
+++ b/fs/nfs/Makefile
@@ -23,11 +23,11 @@ obj-$(CONFIG_NFS_V4) += nfsv4.o
CFLAGS_nfs4trace.o += -I$(src)
nfsv4-y := nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o nfs4super.o nfs4file.o \
delegation.o idmap.o callback.o callback_xdr.o callback_proc.o \
- nfs4namespace.o nfs4getroot.o nfs4client.o dns_resolve.o \
- nfs4trace.o
+ nfs4namespace.o nfs4getroot.o nfs4client.o nfs4session.o \
+ dns_resolve.o nfs4trace.o
nfsv4-$(CONFIG_NFS_USE_LEGACY_DNS) += cache_lib.o
nfsv4-$(CONFIG_SYSCTL) += nfs4sysctl.o
-nfsv4-$(CONFIG_NFS_V4_1) += nfs4session.o pnfs.o pnfs_dev.o
+nfsv4-$(CONFIG_NFS_V4_1) += pnfs.o pnfs_dev.o
obj-$(CONFIG_PNFS_FILE_LAYOUT) += nfs_layout_nfsv41_files.o
nfs_layout_nfsv41_files-y := nfs4filelayout.o nfs4filelayoutdev.o