From: Christoph Hellwig <hch@lst.de>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: linux-nfs@vger.kernel.org
Subject: [PATCH 4/4] nfsd: remove <linux/nfsd/debug.h>
Date: Tue, 6 May 2014 19:37:16 +0200 [thread overview]
Message-ID: <1399397836-31948-5-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1399397836-31948-1-git-send-email-hch@lst.de>
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>
---
fs/nfsd/nfsd.h | 9 ++++++++-
include/linux/nfsd/debug.h | 19 -------------------
2 files changed, 8 insertions(+), 20 deletions(-)
delete mode 100644 include/linux/nfsd/debug.h
diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
index 7a07f9c..e9f2fd4 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 19ef837..0000000
--- 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 */
--
1.7.10.4
next prev parent reply other threads:[~2014-05-06 17:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-06 17:37 get rid of include/linux/nfsd Christoph Hellwig
2014-05-06 17:37 ` [PATCH 1/4] nfsd: remove <linux/nfsd/nfsfh.h> Christoph Hellwig
2014-05-06 17:37 ` [PATCH 2/4] nfsd: move <linux/nfsd/export.h> to fs/nfsd Christoph Hellwig
2014-05-06 17:37 ` [PATCH 3/4] nfsd: move <linux/nfsd/stats.h> " Christoph Hellwig
2014-05-06 17:37 ` Christoph Hellwig [this message]
2014-05-06 19:09 ` get rid of include/linux/nfsd J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1399397836-31948-5-git-send-email-hch@lst.de \
--to=hch@lst.de \
--cc=bfields@fieldses.org \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).