diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-12-17 15:22:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-12-17 15:22:35 +0100 |
| commit | ffe732c2430c55074bebb172d33d909c662cd0e3 (patch) | |
| tree | d39087d7b5d8caa505b23b6ea2abc2e33efa5be5 /fs/nfs/dns_resolve.c | |
| parent | 40ea2b42d7c44386cf81d5636d574193da2c8df2 (diff) | |
| parent | 757dfcaa41844595964f1220f1d33182dae49976 (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge the latest batch of fixes before applying development patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/nfs/dns_resolve.c')
| -rw-r--r-- | fs/nfs/dns_resolve.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/dns_resolve.c b/fs/nfs/dns_resolve.c index fc0f95ec7358..d25f10fb4926 100644 --- a/fs/nfs/dns_resolve.c +++ b/fs/nfs/dns_resolve.c @@ -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" |