From: andros@netapp.com
To: pnfs@linux-nfs.org
Cc: linux-nfs@vger.kernel.org, Andy Adamson <andros@netapp.com>
Subject: [PATCH 6/6] pnfsd: fix compile errors when CONFIG_PNFSD is not set
Date: Tue, 9 Feb 2010 12:42:37 -0500 [thread overview]
Message-ID: <1265737357-9405-7-git-send-email-andros@netapp.com> (raw)
In-Reply-To: <1265737357-9405-6-git-send-email-andros@netapp.com>
From: Andy Adamson <andros@netapp.com>
Signed-off-by: Andy Adamson <andros@netapp.com>
---
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 */
--
1.6.6
next prev parent reply other threads:[~2010-02-09 17:43 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-09 17:42 [PATCH 0/6] pnfs DLM cluster only use read iomode layouts Version 2 andros
2010-02-09 17:42 ` [PATCH 1/6] pnfsd: fix file system API layout_get error codes andros
2010-02-09 17:42 ` [PATCH 2/6] pnfsd: fix NFS4ERR_BADIOMODE in layoutget andros
2010-02-09 17:42 ` [PATCH 3/6] pnfsd: DLM file layout only support read iomode layouts andros
2010-02-09 17:42 ` [PATCH 4/6] pnfsd: fix DLM file layout no device return andros
2010-02-09 17:42 ` [PATCH 5/6] pnfs: set failed layout bit per iomode andros
2010-02-09 17:42 ` andros [this message]
2010-02-09 18:00 ` [pnfs] [PATCH 6/6] pnfsd: fix compile errors when CONFIG_PNFSD is not set Benny Halevy
2010-02-09 19:29 ` Andy Adamson
2010-02-09 18:03 ` [pnfs] [PATCH 2/6] pnfsd: fix NFS4ERR_BADIOMODE in layoutget Benny Halevy
2010-02-09 18:57 ` Andy Adamson
2010-02-10 8:26 ` Boaz Harrosh
2010-02-10 8:24 ` [PATCH] SQUASHME: pnfsd-exofs: Change layoutget return codes Boaz Harrosh
2010-02-10 10:45 ` [pnfs] " Boaz Harrosh
2010-02-10 13:06 ` Halevy, Benny
[not found] ` <7225594ED4A1304C9E43D030A886D221F4C8EC-QcknvLX4j1suWLk7KE+CsC1byIy0dIec@public.gmane.org>
2010-02-10 13:43 ` Boaz Harrosh
2010-02-11 16:38 ` J. Bruce Fields
2010-02-11 17:34 ` Benny Halevy
2010-02-10 10:47 ` [PATCH version2] " Boaz Harrosh
2010-02-11 10:53 ` Benny Halevy
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=1265737357-9405-7-git-send-email-andros@netapp.com \
--to=andros@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=pnfs@linux-nfs.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