mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
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 <guozihua@huawei.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
parent
e87cf8a28e
commit
08be82ba0c
|
@ -7,14 +7,16 @@
|
||||||
* Resolves DNS hostnames into valid ip addresses
|
* Resolves DNS hostnames into valid ip addresses
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef CONFIG_NFS_USE_KERNEL_DNS
|
|
||||||
|
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/sunrpc/clnt.h>
|
#include <linux/sunrpc/clnt.h>
|
||||||
#include <linux/sunrpc/addr.h>
|
#include <linux/sunrpc/addr.h>
|
||||||
#include <linux/dns_resolver.h>
|
|
||||||
#include "dns_resolve.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,
|
ssize_t nfs_dns_resolve_name(struct net *net, char *name, size_t namelen,
|
||||||
struct sockaddr_storage *ss, size_t salen)
|
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
|
#else
|
||||||
|
|
||||||
#include <linux/module.h>
|
|
||||||
#include <linux/hash.h>
|
#include <linux/hash.h>
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
#include <linux/kmod.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/socket.h>
|
||||||
#include <linux/seq_file.h>
|
#include <linux/seq_file.h>
|
||||||
#include <linux/inet.h>
|
#include <linux/inet.h>
|
||||||
#include <linux/sunrpc/clnt.h>
|
|
||||||
#include <linux/sunrpc/addr.h>
|
|
||||||
#include <linux/sunrpc/cache.h>
|
#include <linux/sunrpc/cache.h>
|
||||||
#include <linux/sunrpc/svcauth.h>
|
#include <linux/sunrpc/svcauth.h>
|
||||||
#include <linux/sunrpc/rpc_pipe_fs.h>
|
#include <linux/sunrpc/rpc_pipe_fs.h>
|
||||||
#include <linux/nfs_fs.h>
|
#include <linux/nfs_fs.h>
|
||||||
|
|
||||||
#include "nfs4_fs.h"
|
#include "nfs4_fs.h"
|
||||||
#include "dns_resolve.h"
|
|
||||||
#include "cache_lib.h"
|
#include "cache_lib.h"
|
||||||
#include "netns.h"
|
#include "netns.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue