On Feb 9, 2010, at 1:00 PM, Benny Halevy wrote:
I don't see any problems with CONFIG_PNFSD=n
both fs/nfsd/nfs4pnfsd.c and fs/nfsd/nfs4pnfsdlm.c are built only
conditionally
with PNFSD is configured.
Yep - I was building directly e.g.
% make fs/nfsd/nfs4pnfsd.o
Which of course doesn't happen :)
-->Andy
fs/nfsd/Makefile:
nfsd-$(CONFIG_PNFSD) += nfs4pnfsd.o nfs4pnfsdlm.o nfs4pnfsds.o
Benny
On Feb. 09, 2010, 19:42 +0200, andros@xxxxxxxxxx wrote:
From: Andy Adamson <andros@xxxxxxxxxx>
Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
---
fs/nfsd/nfs4pnfsd.c | 4 ++++
fs/nfsd/nfs4pnfsdlm.c | 4 ++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/fs/nfsd/nfs4pnfsd.c b/fs/nfsd/nfs4pnfsd.c
index 75bddd8..44a1edd 100644
--- a/fs/nfsd/nfs4pnfsd.c
+++ b/fs/nfsd/nfs4pnfsd.c
@@ -21,6 +21,8 @@
*
*****************************************************************************/
+#if defined(CONFIG_PNFSD)
+
#include "pnfsd.h"
#define NFSDDBG_FACILITY NFSDDBG_PROC
@@ -1676,3 +1678,5 @@ int nfsd_device_notify_cb(struct super_block
*sb,
__func__, status, notify_num);
return status;
}
+
+#endif /* CONFIG_PNFSD */
diff --git a/fs/nfsd/nfs4pnfsdlm.c b/fs/nfsd/nfs4pnfsdlm.c
index 83c4698..8e8a5a8 100644
--- a/fs/nfsd/nfs4pnfsdlm.c
+++ b/fs/nfsd/nfs4pnfsdlm.c
@@ -21,6 +21,8 @@
*
******************************************************************************/
+#if defined(CONFIG_PNFSD)
+
#include <linux/nfs4.h>
#include <linux/nfsd/const.h>
#include <linux/nfsd/debug.h>
@@ -402,3 +404,5 @@ const struct pnfs_export_operations
pnfs_dlm_export_ops = {
.layout_get = nfsd4_pnfs_dlm_layoutget,
};
EXPORT_SYMBOL(pnfs_dlm_export_ops);
+
+#endif /* CONFIG_PNFSD */
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
