These are pure protocol level constants
squash into "pnfs: add LAYOUTGET and GETDEVICEINFO infrastructure"
Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx>
---
fs/nfs/pnfs.h | 6 ------
include/linux/nfs4.h | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 97c3bc4..9500aa4 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -38,8 +38,6 @@ struct pnfs_layout_segment {
struct pnfs_layout_hdr *layout;
};
-#define NFS4_DEVICEID4_SIZE 16
-
enum pnfs_try_status {
PNFS_ATTEMPTED = 0,
PNFS_NOT_ATTEMPTED = 1,
@@ -113,10 +111,6 @@ struct pnfs_layout_hdr {
struct inode *inode;
};
-struct nfs4_deviceid {
- char data[NFS4_DEVICEID4_SIZE];
-};
-
struct pnfs_device {
struct nfs4_deviceid dev_id;
unsigned int layout_type;
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index ae99e4f..3d04746 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -613,6 +613,12 @@ enum filelayout_hint_care4 {
NFLH4_CARE_STRIPE_COUNT = 0x00000080
};
+#define NFS4_DEVICEID4_SIZE 16
+
+struct nfs4_deviceid {
+ char data[NFS4_DEVICEID4_SIZE];
+};
+
#endif
#endif
--
1.7.2.3
--
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
