nfsd: drop the ncf_cb_bmap field

This is always the same value, and in a later patch we're going to need
to set bits in WORD2. We can simplify this code and save a little space
in the delegation too. Just hardcode the bitmap in the callback encode
function.

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

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 478b548f4147f6966aa578fca73925ee456a0cbc..f5ba9be917700b6d16aba41e70de1ddd86f09a95 100644 (file)
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -364,10 +364,13 @@ encode_cb_getattr4args(struct xdr_stream *xdr, struct nfs4_cb_compound_hdr *hdr,
        struct nfs4_delegation *dp =
                container_of(fattr, struct nfs4_delegation, dl_cb_fattr);
        struct knfsd_fh *fh = &dp->dl_stid.sc_file->fi_fhandle;
+       u32 bmap[1];
+
+       bmap[0] = FATTR4_WORD0_CHANGE | FATTR4_WORD0_SIZE;
 
        encode_nfs_cb_opnum4(xdr, OP_CB_GETATTR);
        encode_nfs_fh4(xdr, fh);
-       encode_bitmap4(xdr, fattr->ncf_cb_bmap, ARRAY_SIZE(fattr->ncf_cb_bmap));
+       encode_bitmap4(xdr, bmap, ARRAY_SIZE(bmap));
        hdr->nops++;
 }
 

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index d3cfc6471539932fadc01a95a1fe0948f2935666..f25d183987139a29e3fb1a5ec43a8c345cadb70b 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1184,7 +1184,6 @@ alloc_init_deleg(struct nfs4_client *clp, struct nfs4_file *fp,
        nfsd4_init_cb(&dp->dl_cb_fattr.ncf_getattr, dp->dl_stid.sc_client,
                        &nfsd4_cb_getattr_ops, NFSPROC4_CLNT_CB_GETATTR);
        dp->dl_cb_fattr.ncf_file_modified = false;
-       dp->dl_cb_fattr.ncf_cb_bmap[0] = FATTR4_WORD0_CHANGE | FATTR4_WORD0_SIZE;
        get_nfs4_file(fp);
        dp->dl_stid.sc_file = fp;
        return dp;

diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 35b3564c065fa97b9fd399d455d3dcec932a1767..9721c6d6ec42955c0cd3b7f3e3188b442edd2b23 100644 (file)
--- a/fs/nfsd/state.h
+++ b/fs/nfsd/state.h
@@ -140,7 +140,6 @@ struct nfs4_cpntf_state {
 struct nfs4_cb_fattr {
        struct nfsd4_callback ncf_getattr;
        u32 ncf_cb_status;
-       u32 ncf_cb_bmap[1];
 
        /* from CB_GETATTR reply */
        u64 ncf_cb_change;