diff options
| author | Christoph Hellwig <hch@lst.de> | 2014-05-06 19:37:16 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-05-06 17:54:56 -0400 |
| commit | 6f226e2ab1b895c8685e868af0a5f797fcaaaf57 (patch) | |
| tree | cfd53fa04ce0249706e818fe058e2bbe9fc452a2 | |
| parent | 7f94423e8fcc1e0f3416be76d3da0982f586d565 (diff) | |
| download | linux-next-6f226e2ab1b895c8685e868af0a5f797fcaaaf57.tar.gz | |
nfsd: remove <linux/nfsd/debug.h>
There is almost nothing left it in, just merge it into the only file
that includes it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| -rw-r--r-- | fs/nfsd/nfsd.h | 9 | ||||
| -rw-r--r-- | include/linux/nfsd/debug.h | 19 |
2 files changed, 8 insertions, 20 deletions
diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h index 7a07f9c6ee78..e9f2fd42d184 100644 --- a/fs/nfsd/nfsd.h +++ b/fs/nfsd/nfsd.h @@ -18,11 +18,18 @@ #include <linux/sunrpc/svc.h> #include <linux/sunrpc/msg_prot.h> -#include <linux/nfsd/debug.h> +#include <uapi/linux/nfsd/debug.h> #include "stats.h" #include "export.h" +#undef ifdebug +#ifdef NFSD_DEBUG +# define ifdebug(flag) if (nfsd_debug & NFSDDBG_##flag) +#else +# define ifdebug(flag) if (0) +#endif + /* * nfsd version */ diff --git a/include/linux/nfsd/debug.h b/include/linux/nfsd/debug.h deleted file mode 100644 index 19ef8375b577..000000000000 --- a/include/linux/nfsd/debug.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * linux/include/linux/nfsd/debug.h - * - * Debugging-related stuff for nfsd - * - * Copyright (C) 1995 Olaf Kirch <okir@monad.swb.de> - */ -#ifndef LINUX_NFSD_DEBUG_H -#define LINUX_NFSD_DEBUG_H - -#include <uapi/linux/nfsd/debug.h> - -# undef ifdebug -# ifdef NFSD_DEBUG -# define ifdebug(flag) if (nfsd_debug & NFSDDBG_##flag) -# else -# define ifdebug(flag) if (0) -# endif -#endif /* LINUX_NFSD_DEBUG_H */ |