summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2014-05-06 19:37:14 +0200
committerJ. Bruce Fields <bfields@redhat.com>2014-05-06 17:54:54 -0400
commitd430e8d530e900c923bf77718d72478b1c280592 (patch)
treea8907dc9e4fd7d8e7cec2f8ba3498752a1140a91
parent9c69de4c94fcb11db919160d5fa0b48f13d1757a (diff)
downloadblackbird-op-linux-d430e8d530e900c923bf77718d72478b1c280592.tar.gz
blackbird-op-linux-d430e8d530e900c923bf77718d72478b1c280592.zip
nfsd: move <linux/nfsd/export.h> to fs/nfsd
There are no legitimate users outside of fs/nfsd, so move it there. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--fs/lockd/svcsubs.c1
-rw-r--r--fs/nfsd/export.h (renamed from include/linux/nfsd/export.h)5
-rw-r--r--fs/nfsd/nfsd.h3
3 files changed, 2 insertions, 7 deletions
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c
index 7ec6b1074d8c..b6f3b84b6e99 100644
--- a/fs/lockd/svcsubs.c
+++ b/fs/lockd/svcsubs.c
@@ -14,7 +14,6 @@
#include <linux/mutex.h>
#include <linux/sunrpc/svc.h>
#include <linux/sunrpc/addr.h>
-#include <linux/nfsd/export.h>
#include <linux/lockd/lockd.h>
#include <linux/lockd/share.h>
#include <linux/module.h>
diff --git a/include/linux/nfsd/export.h b/fs/nfsd/export.h
index b12c4e526ef2..d7939a62a0ae 100644
--- a/include/linux/nfsd/export.h
+++ b/fs/nfsd/export.h
@@ -1,9 +1,4 @@
/*
- * include/linux/nfsd/export.h
- *
- * Public declarations for NFS exports. The definitions for the
- * syscall interface are in nfsctl.h
- *
* Copyright (C) 1995-1997 Olaf Kirch <okir@monad.swb.de>
*/
#ifndef NFSD_EXPORT_H
diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
index 7d5c310678d0..72004caad718 100644
--- a/fs/nfsd/nfsd.h
+++ b/fs/nfsd/nfsd.h
@@ -19,9 +19,10 @@
#include <linux/sunrpc/msg_prot.h>
#include <linux/nfsd/debug.h>
-#include <linux/nfsd/export.h>
#include <linux/nfsd/stats.h>
+#include "export.h"
+
/*
* nfsd version
*/
OpenPOWER on IntegriCloud