NFSD: Make @lgp parameter of ->encode_layoutget a const pointer

This enables callers to be passed const pointer parameters.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/nfsd/blocklayoutxdr.c b/fs/nfsd/blocklayoutxdr.c
index 1ed2f691ebb908670387c05da0968249a89041af..f8469348e06e8484de1378e58e0508600115f210 100644 (file)
--- a/fs/nfsd/blocklayoutxdr.c
+++ b/fs/nfsd/blocklayoutxdr.c
@@ -16,9 +16,9 @@
 
 __be32
 nfsd4_block_encode_layoutget(struct xdr_stream *xdr,
-               struct nfsd4_layoutget *lgp)
+               const struct nfsd4_layoutget *lgp)
 {
-       struct pnfs_block_extent *b = lgp->lg_content;
+       const struct pnfs_block_extent *b = lgp->lg_content;
        int len = sizeof(__be32) + 5 * sizeof(__be64) + sizeof(__be32);
        __be32 *p;
 

diff --git a/fs/nfsd/blocklayoutxdr.h b/fs/nfsd/blocklayoutxdr.h
index bc5166bfe46bf1dea2c219fd44f740a3438d5f5a..5f88539e81a1c5bdad1eaf36e5f9990e46225d60 100644 (file)
--- a/fs/nfsd/blocklayoutxdr.h
+++ b/fs/nfsd/blocklayoutxdr.h
@@ -53,7 +53,7 @@ struct pnfs_block_deviceaddr {
 __be32 nfsd4_block_encode_getdeviceinfo(struct xdr_stream *xdr,
                struct nfsd4_getdeviceinfo *gdp);
 __be32 nfsd4_block_encode_layoutget(struct xdr_stream *xdr,
-               struct nfsd4_layoutget *lgp);
+               const struct nfsd4_layoutget *lgp);
 int nfsd4_block_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,
                u32 block_size);
 int nfsd4_scsi_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,

diff --git a/fs/nfsd/flexfilelayoutxdr.c b/fs/nfsd/flexfilelayoutxdr.c
index bb205328e043dafee5b2daa7d9f5023a576d8e32..5319cb97d8a7e80833818b2b0ddd001defc4a2b8 100644 (file)
--- a/fs/nfsd/flexfilelayoutxdr.c
+++ b/fs/nfsd/flexfilelayoutxdr.c
@@ -17,9 +17,9 @@ struct ff_idmap {
 
 __be32
 nfsd4_ff_encode_layoutget(struct xdr_stream *xdr,
-               struct nfsd4_layoutget *lgp)
+               const struct nfsd4_layoutget *lgp)
 {
-       struct pnfs_ff_layout *fl = lgp->lg_content;
+       const struct pnfs_ff_layout *fl = lgp->lg_content;
        int len, mirror_len, ds_len, fh_len;
        __be32 *p;
 

diff --git a/fs/nfsd/flexfilelayoutxdr.h b/fs/nfsd/flexfilelayoutxdr.h
index 8e195aeca0237765666abd237e76480688686f80..a447efb7759b1047fe5415c99b9a72c878ec9e4a 100644 (file)
--- a/fs/nfsd/flexfilelayoutxdr.h
+++ b/fs/nfsd/flexfilelayoutxdr.h
@@ -45,6 +45,6 @@ struct pnfs_ff_layout {
 __be32 nfsd4_ff_encode_getdeviceinfo(struct xdr_stream *xdr,
                struct nfsd4_getdeviceinfo *gdp);
 __be32 nfsd4_ff_encode_layoutget(struct xdr_stream *xdr,
-               struct nfsd4_layoutget *lgp);
+               const struct nfsd4_layoutget *lgp);
 
 #endif /* _NFSD_FLEXFILELAYOUTXDR_H */

diff --git a/fs/nfsd/pnfs.h b/fs/nfsd/pnfs.h
index 4f4282d4eeca41f5f99e9be2c41f4bd5a59a075f..d8e1a333fa0a7a7123e7ffa42e76ba6e56074fd2 100644 (file)
--- a/fs/nfsd/pnfs.h
+++ b/fs/nfsd/pnfs.h
@@ -31,8 +31,8 @@ struct nfsd4_layout_ops {
 
        __be32 (*proc_layoutget)(struct inode *, const struct svc_fh *fhp,
                        struct nfsd4_layoutget *lgp);
-       __be32 (*encode_layoutget)(struct xdr_stream *,
-                       struct nfsd4_layoutget *lgp);
+       __be32 (*encode_layoutget)(struct xdr_stream *xdr,
+                       const struct nfsd4_layoutget *lgp);
 
        __be32 (*proc_layoutcommit)(struct inode *inode,
                        struct nfsd4_layoutcommit *lcp);