[pnfs] [PATCH 4/4 v2] deviceid64: filelayout server

[Benny Halevy]

change deviceid from u32 to u64

Signed-off-by: Benny Halevy <bhalevy at panasas.com>
---
 fs/nfsd/nfs4filelayoutxdr.c        |    4 ++--
 include/linux/nfsd/nfs4layoutxdr.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/nfsd/nfs4filelayoutxdr.c b/fs/nfsd/nfs4filelayoutxdr.c
index 28badc6..cb50f3b 100644
--- a/fs/nfsd/nfs4filelayoutxdr.c
+++ b/fs/nfsd/nfs4filelayoutxdr.c
@@ -89,10 +89,10 @@ filelayout_encode_layoutlist_item(u32 *p, u32 *end, struct nfsd4_pnfs_layoutlist
 	int len;
 	unsigned int fhlen = item->dev_fh.fh_size;
 
-	len = 12 + fhlen;
+	len = 16 + fhlen;
 	if (p + XDR_QUADLEN(len) > end)
 		return -ENOMEM;
-	WRITE32(item->dev_id);
+	WRITE64(item->dev_id);
 	WRITE32(item->dev_index);
 	WRITE32(fhlen);
 	WRITEMEM(&item->dev_fh.fh_base, fhlen);
diff --git a/include/linux/nfsd/nfs4layoutxdr.h b/include/linux/nfsd/nfs4layoutxdr.h
index 25cde5f..f670986 100644
--- a/include/linux/nfsd/nfs4layoutxdr.h
+++ b/include/linux/nfsd/nfs4layoutxdr.h
@@ -64,7 +64,7 @@ struct pnfs_filelayout_devaddr {
 };
 
 struct nfsd4_pnfs_layoutlist {
-	u32				dev_id;
+	u64				dev_id;
 	u32                             dev_index;
 	struct knfsd_fh                 dev_fh;
 };
-- 
1.5.2.86.g99b5