Commit 5f9a62ff authored by Chuck Lever's avatar Chuck Lever
Browse files

NFSD: Remove CONFIG_NFSD_V3 



Eventually support for NFSv2 in the Linux NFS server is to be
deprecated and then removed.

However, NFSv2 is the "always supported" version that is available
as soon as CONFIG_NFSD is set.  Before NFSv2 support can be removed,
we need to choose a different "always supported" version.

This patch removes CONFIG_NFSD_V3 so that NFSv3 is always supported,
as NFSv2 is today. When NFSv2 support is removed, NFSv3 will become
the only "always supported" NFS version.

The defconfigs still need to be updated to remove CONFIG_NFSD_V3=y.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 4d2eeafe

fs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ config LOCKD 


config LOCKD_V4

	bool

	depends on NFSD_V3 || NFS_V3

	depends on NFSD || NFS_V3

	depends on FILE_LOCKING

	default y

fs/nfsd/Kconfig

+1 −11
Original line number Diff line number Diff line
@@ -35,18 +35,9 @@ config NFSD_V2_ACL 
	bool

	depends on NFSD



config NFSD_V3

	bool "NFS server support for NFS version 3"

	depends on NFSD

	help

	  This option enables support in your system's NFS server for

	  version 3 of the NFS protocol (RFC 1813).



	  If unsure, say Y.



config NFSD_V3_ACL

	bool "NFS server support for the NFSv3 ACL protocol extension"

	depends on NFSD_V3

	depends on NFSD

	select NFSD_V2_ACL

	help

	  Solaris NFS servers support an auxiliary NFSv3 ACL protocol that
@@ -70,7 +61,6 @@ config NFSD_V3_ACL 
config NFSD_V4

	bool "NFS server support for NFS version 4"

	depends on NFSD && PROC_FS

	select NFSD_V3

	select FS_POSIX_ACL

	select SUNRPC_GSS

	select CRYPTO

fs/nfsd/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -12,9 +12,8 @@ nfsd-y += trace.o 


nfsd-y 			+= nfssvc.o nfsctl.o nfsproc.o nfsfh.o vfs.o \

			   export.o auth.o lockd.o nfscache.o nfsxdr.o \

			   stats.o filecache.o

			   stats.o filecache.o nfs3proc.o nfs3xdr.o

nfsd-$(CONFIG_NFSD_V2_ACL) += nfs2acl.o

nfsd-$(CONFIG_NFSD_V3)	+= nfs3proc.o nfs3xdr.o

nfsd-$(CONFIG_NFSD_V3_ACL) += nfs3acl.o

nfsd-$(CONFIG_NFSD_V4)	+= nfs4proc.o nfs4xdr.o nfs4state.o nfs4idmap.o \

			   nfs4acl.o nfs4callback.o nfs4recover.o

fs/nfsd/nfsfh.c

+0 −4
Original line number Diff line number Diff line
@@ -611,8 +611,6 @@ fh_update(struct svc_fh *fhp) 
	return nfserr_serverfault;

}



#ifdef CONFIG_NFSD_V3



/**

 * fh_fill_pre_attrs - Fill in pre-op attributes

 * @fhp: file handle to be updated
@@ -673,8 +671,6 @@ void fh_fill_post_attrs(struct svc_fh *fhp) 
			nfsd4_change_attribute(&fhp->fh_post_attr, inode);

}



#endif /* CONFIG_NFSD_V3 */



/*

 * Release a file handle.

 */

fs/nfsd/nfsfh.h

+0 −20
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ typedef struct svc_fh { 
						 * operation

						 */

	int			fh_flags;	/* FH flags */

#ifdef CONFIG_NFSD_V3

	bool			fh_post_saved;	/* post-op attrs saved */

	bool			fh_pre_saved;	/* pre-op attrs saved */
@@ -107,7 +106,6 @@ typedef struct svc_fh { 
	/* Post-op attributes saved in fh_unlock */

	struct kstat		fh_post_attr;	/* full attrs after operation */

	u64			fh_post_change; /* nfsv4 change; see above */

#endif /* CONFIG_NFSD_V3 */

} svc_fh;

#define NFSD4_FH_FOREIGN (1<<0)

#define SET_FH_FLAG(c, f) ((c)->fh_flags |= (f))
@@ -283,8 +281,6 @@ static inline u32 knfsd_fh_hash(const struct knfsd_fh *fh) 
}

#endif



#ifdef CONFIG_NFSD_V3



/**

 * fh_clear_pre_post_attrs - Reset pre/post attributes

 * @fhp: file handle to be updated
@@ -327,22 +323,6 @@ static inline u64 nfsd4_change_attribute(struct kstat *stat, 
extern void fh_fill_pre_attrs(struct svc_fh *fhp);

extern void fh_fill_post_attrs(struct svc_fh *fhp);



#else /* !CONFIG_NFSD_V3 */



static inline void fh_clear_pre_post_attrs(struct svc_fh *fhp)

{

}



static inline void fh_fill_pre_attrs(struct svc_fh *fhp)

{

}



static inline void fh_fill_post_attrs(struct svc_fh *fhp)

{

}



#endif /* !CONFIG_NFSD_V3 */





/*

 * Lock a file handle/inode