Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 694e096f authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust
Browse files

NFS: Enabling v4.2 should not recompile nfsd and lockd 



When CONFIG_NFS_V4_2 is toggled nfsd and lockd will be recompiled,
instead of only the nfs client.  This patch moves a small amount of code
into the client directory to avoid unnecessary recompiles.

Signed-off-by: default avatarAnna Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 8c2fabc6

fs/nfs/blocklayout/blocklayout.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/nfs_fs.h>

#include <linux/sunrpc/rpc_pipe_fs.h>



#include "../nfs4_fs.h"

#include "../pnfs.h"

#include "../netns.h"

fs/nfs/dns_resolve.c

+2 −0
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ ssize_t nfs_dns_resolve_name(struct net *net, char *name, size_t namelen, 
#include <linux/sunrpc/cache.h>

#include <linux/sunrpc/svcauth.h>

#include <linux/sunrpc/rpc_pipe_fs.h>

#include <linux/nfs_fs.h>



#include "nfs4_fs.h"

#include "dns_resolve.h"

#include "cache_lib.h"

#include "netns.h"

fs/nfs/internal.h

+15 −0
Original line number Diff line number Diff line
@@ -269,6 +269,21 @@ extern const u32 nfs41_maxgetdevinfo_overhead; 
extern struct rpc_procinfo nfs4_procedures[];

#endif



#ifdef CONFIG_NFS_V4_SECURITY_LABEL

extern struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags);

static inline void nfs4_label_free(struct nfs4_label *label)

{

	if (label) {

		kfree(label->label);

		kfree(label);

	}

	return;

}

#else

static inline struct nfs4_label *nfs4_label_alloc(struct nfs_server *server, gfp_t flags) { return NULL; }

static inline void nfs4_label_free(void *label) {}

#endif /* CONFIG_NFS_V4_SECURITY_LABEL */



/* proc.c */

void nfs_close_context(struct nfs_open_context *ctx, int is_sync);

extern struct nfs_client *nfs_init_client(struct nfs_client *clp,

fs/nfs/nfs4_fs.h

+8 −0
Original line number Diff line number Diff line
@@ -9,6 +9,14 @@ 
#ifndef __LINUX_FS_NFS_NFS4_FS_H

#define __LINUX_FS_NFS_NFS4_FS_H



#if defined(CONFIG_NFS_V4_2)

#define NFS4_MAX_MINOR_VERSION 2

#elif defined(CONFIG_NFS_V4_1)

#define NFS4_MAX_MINOR_VERSION 1

#else

#define NFS4_MAX_MINOR_VERSION 0

#endif



#if IS_ENABLED(CONFIG_NFS_V4)



#define NFS4_MAX_LOOP_ON_RECOVER (10)

include/linux/nfs4.h

+0 −10
Original line number Diff line number Diff line
@@ -410,16 +410,6 @@ enum lock_type4 { 
#define NFS4_VERSION 4

#define NFS4_MINOR_VERSION 0



#if defined(CONFIG_NFS_V4_2)

#define NFS4_MAX_MINOR_VERSION 2

#else

#if defined(CONFIG_NFS_V4_1)

#define NFS4_MAX_MINOR_VERSION 1

#else

#define NFS4_MAX_MINOR_VERSION 0

#endif /* CONFIG_NFS_V4_1 */

#endif /* CONFIG_NFS_V4_2 */



#define NFS4_DEBUG 1



/* Index of predefined Linux client operations */