From: Benny Halevy <benny@tonian.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH 04/13] pnfsd-block: mv include/linux/nfsd4_block.h include/linux/nfsd/
Date: Sun, 4 Dec 2011 15:48:28 +0200 [thread overview]
Message-ID: <1323006508-13581-1-git-send-email-benny@tonian.com> (raw)
In-Reply-To: <4EDB79A9.2080109@tonian.com>
From: Benny Halevy <bhalevy@tonian.com>
Signed-off-by: Benny Halevy <bhalevy@tonian.com>
---
fs/nfsd/bl_com.c | 2 +-
fs/nfsd/bl_ops.c | 2 +-
fs/nfsd/export.c | 2 +-
fs/nfsd/nfs4proc.c | 2 +-
fs/nfsd/nfs4xdr.c | 2 +-
fs/nfsd/vfs.c | 2 +-
include/linux/{ => nfsd}/nfsd4_block.h | 0
7 files changed, 6 insertions(+), 6 deletions(-)
rename include/linux/{ => nfsd}/nfsd4_block.h (100%)
diff --git a/fs/nfsd/bl_com.c b/fs/nfsd/bl_com.c
index cf37814..388d71a 100644
--- a/fs/nfsd/bl_com.c
+++ b/fs/nfsd/bl_com.c
@@ -19,7 +19,7 @@
#include <linux/nfs_fs.h>
#include <linux/nfsd/debug.h>
-#include <linux/nfsd4_block.h>
+#include <linux/nfsd/nfsd4_block.h>
#define NFSDDBG_FACILITY NFSDDBG_PNFS
diff --git a/fs/nfsd/bl_ops.c b/fs/nfsd/bl_ops.c
index 4d2939e..15d2604 100644
--- a/fs/nfsd/bl_ops.c
+++ b/fs/nfsd/bl_ops.c
@@ -28,7 +28,7 @@
#include <linux/dm-ioctl.h>
#include <asm/uaccess.h>
#include <linux/falloc.h>
-#include <linux/nfsd4_block.h>
+#include <linux/nfsd/nfsd4_block.h>
#include "pnfsd.h"
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 10a05de..9585795 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -19,7 +19,7 @@
#if defined(CONFIG_SPNFS)
#include <linux/nfsd4_spnfs.h>
#if defined(CONFIG_SPNFS_BLOCK)
-#include <linux/nfsd4_block.h>
+#include <linux/nfsd/nfsd4_block.h>
#endif
#endif
#include <net/ipv6.h>
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index e4745ca..501781d 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -36,7 +36,7 @@
#include <linux/slab.h>
#include <linux/nfsd/nfs4layoutxdr.h>
#include <linux/nfsd4_spnfs.h>
-#include <linux/nfsd4_block.h>
+#include <linux/nfsd/nfsd4_block.h>
#include "idmap.h"
#include "cache.h"
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index bd8e693..cebd5a2 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -49,7 +49,7 @@
#include <linux/exportfs.h>
#include <linux/nfsd/nfs4layoutxdr.h>
#include <linux/nfsd4_spnfs.h>
-#include <linux/nfsd4_block.h>
+#include <linux/nfsd/nfsd4_block.h>
#include "idmap.h"
#include "acl.h"
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
index 43efbdc..ce07f67 100644
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
@@ -40,7 +40,7 @@
#include <linux/nfsd4_spnfs.h>
#endif /* CONFIG_NFSD_V4 */
#if defined(CONFIG_SPNFS_BLOCK)
-#include <linux/nfsd4_block.h>
+#include <linux/nfsd/nfsd4_block.h>
#endif
#include "nfsd.h"
diff --git a/include/linux/nfsd4_block.h b/include/linux/nfsd/nfsd4_block.h
similarity index 100%
rename from include/linux/nfsd4_block.h
rename to include/linux/nfsd/nfsd4_block.h
--
1.7.6
next prev parent reply other threads:[~2011-12-04 13:48 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-04 13:46 [PATCH 0/13] misc pnfsd patches Benny Halevy
2011-12-04 13:47 ` [PATCH 01/13] SQUASHME: pnfsd: add missing nfs4_unlock_state in nfs4_pnfs_return_layout Benny Halevy
2011-12-04 13:48 ` [PATCH 02/13] DEBUG: pnfsd: printouts Benny Halevy
2011-12-04 13:48 ` [PATCH 03/13] pnfsd-block: reverse boolean_t values so they make sense Benny Halevy
2011-12-06 2:10 ` J. Bruce Fields
2011-12-06 11:27 ` Benny Halevy
2011-12-06 11:56 ` J. Bruce Fields
2011-12-07 12:45 ` Benny Halevy
2011-12-04 13:48 ` Benny Halevy [this message]
2011-12-06 2:12 ` [PATCH 04/13] pnfsd-block: mv include/linux/nfsd4_block.h include/linux/nfsd/ J. Bruce Fields
2011-12-06 11:28 ` Benny Halevy
2011-12-04 13:48 ` [PATCH 05/13] pnfsd-block: do not override s_pnfs_op Benny Halevy
2011-12-04 13:48 ` [PATCH 06/13] pnfsd-block: change blr_lock to mutex Benny Halevy
2011-12-04 13:49 ` [PATCH 07/13] pnfsd-block: dprint fiemap rval Benny Halevy
2011-12-04 13:49 ` [PATCH 08/13] pnfsd-block: allow positive " Benny Halevy
2011-12-04 13:49 ` [PATCH 09/13] pnfsd-block: use SECT_SIZE helper macros Benny Halevy
2011-12-04 13:49 ` [PATCH 10/13] pnfsd-block: undo dependence on spnfs Benny Halevy
2011-12-04 13:50 ` [PATCH 11/13] pnfsd-block: set the sbid part of the deviceid Benny Halevy
2011-12-04 13:50 ` [PATCH 12/13] DEBUG: pnfs: printouts Benny Halevy
2011-12-04 13:50 ` [PATCH 13/13] DEBUG: pnfsblock: add devid debug printouts 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=1323006508-13581-1-git-send-email-benny@tonian.com \
--to=benny@tonian.com \
--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).