NFS: Move common includes outside ifdef
Subsystems (2)
PATCH 1/1 NFS: Move common includes outside ifdef
module.h, clnt.h, addr.h and dns_resolve.h is always included whether CONFIG_NFS_USE_KERNEL_DNS is set or not and their order does not seems to matter.
Move them outside the ifdef to simplify code and avoid checkincludes message.
Signed-off-by GUO Zihua <[email protected]>
--- fs/nfs/dns_resolve.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
fs/nfs/dns_resolve.c +5 -7
@@ -7,14 +7,16 @@* Resolves DNS hostnames into valid ip addresses */ -#ifdef CONFIG_NFS_USE_KERNEL_DNS -#include <linux/module.h> #include <linux/sunrpc/clnt.h> #include <linux/sunrpc/addr.h> -#include <linux/dns_resolver.h> +#include "dns_resolve.h" +#ifdef CONFIG_NFS_USE_KERNEL_DNS + +#include <linux/dns_resolver.h> +ssize_t nfs_dns_resolve_name (struct net *net,char *name,size_t namelen,struct sockaddr_storage *ss,size_t salen) {
@@ -35,7 +37,6 @@ ssize_t nfs_dns_resolve_name(struct net *net, char *name, size_t namelen,#else -#include <linux/module.h> #include <linux/hash.h> #include <linux/string.h> #include <linux/kmod.h>
@@ -43,15 +44,12 @@ ssize_t nfs_dns_resolve_name(struct net *net, char *name, size_t namelen,#include <linux/socket.h> #include <linux/seq_file.h> #include <linux/inet.h> -#include <linux/sunrpc/clnt.h> -#include <linux/sunrpc/addr.h> #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"
Signature · 1 line
2.17.1