pNFS: Remove unused layout driver callbacks

encode_layoutreturn and encode_layoutcommit are now unused. Let's
remove them.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 80ce289eea05326336a7edecbe8a132ee4900d23..125212588115c4db6c5556b7c8b45b0296139e92 100644 (file)
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -2005,16 +2005,10 @@ encode_layoutcommit(struct xdr_stream *xdr,
        *p++ = cpu_to_be32(0); /* Never send time_modify_changed */
        *p++ = cpu_to_be32(NFS_SERVER(args->inode)->pnfs_curr_ld->id);/* type */
 
-       if (NFS_SERVER(inode)->pnfs_curr_ld->encode_layoutcommit) {
-               NFS_SERVER(inode)->pnfs_curr_ld->encode_layoutcommit(
-                       NFS_I(inode)->layout, xdr, args);
-       } else {
-               encode_uint32(xdr, args->layoutupdate_len);
-               if (args->layoutupdate_pages) {
-                       xdr_write_pages(xdr, args->layoutupdate_pages, 0,
-                                       args->layoutupdate_len);
-               }
-       }
+       encode_uint32(xdr, args->layoutupdate_len);
+       if (args->layoutupdate_pages)
+               xdr_write_pages(xdr, args->layoutupdate_pages, 0,
+                               args->layoutupdate_len);
 
        return 0;
 }
@@ -2024,7 +2018,6 @@ encode_layoutreturn(struct xdr_stream *xdr,
                    const struct nfs4_layoutreturn_args *args,
                    struct compound_hdr *hdr)
 {
-       const struct pnfs_layoutdriver_type *lr_ops = NFS_SERVER(args->inode)->pnfs_curr_ld;
        __be32 *p;
 
        encode_op_hdr(xdr, OP_LAYOUTRETURN, decode_layoutreturn_maxsz, hdr);
@@ -2041,8 +2034,6 @@ encode_layoutreturn(struct xdr_stream *xdr,
        spin_unlock(&args->inode->i_lock);
        if (args->ld_private->ops && args->ld_private->ops->encode)
                args->ld_private->ops->encode(xdr, args, args->ld_private);
-       else if (lr_ops->encode_layoutreturn)
-               lr_ops->encode_layoutreturn(xdr, args);
        else
                encode_uint32(xdr, 0);
 }

diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index 590e1e35781f0b737b5b277d76ab56092f8e3f3b..825a1b8ddc4f9817813e64bab8b2eeaa4a048710 100644 (file)
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -173,14 +173,9 @@ struct pnfs_layoutdriver_type {
                        gfp_t gfp_flags);
 
        int (*prepare_layoutreturn) (struct nfs4_layoutreturn_args *);
-       void (*encode_layoutreturn) (struct xdr_stream *xdr,
-                                    const struct nfs4_layoutreturn_args *args);
 
        void (*cleanup_layoutcommit) (struct nfs4_layoutcommit_data *data);
        int (*prepare_layoutcommit) (struct nfs4_layoutcommit_args *args);
-       void (*encode_layoutcommit) (struct pnfs_layout_hdr *lo,
-                                    struct xdr_stream *xdr,
-                                    const struct nfs4_layoutcommit_args *args);
        int (*prepare_layoutstats) (struct nfs42_layoutstat_args *args);
 };