diff options
| author | Trond Myklebust | 2018-03-20 22:03:09 +0100 |
|---|---|---|
| committer | Anna Schumaker | 2018-04-10 22:06:22 +0200 |
| commit | 40a3426c75e1621ee6d88be2352f5dd85f557aed (patch) | |
| tree | 2e2a9212068e6410ddaeb07ca1bec587b64f25d5 /fs/nfs/nfs4xdr.c | |
| parent | NFSv4; Clean up XDR encoding of type bitmap4 (diff) | |
| download | kernel-qcow2-linux-40a3426c75e1621ee6d88be2352f5dd85f557aed.tar.gz kernel-qcow2-linux-40a3426c75e1621ee6d88be2352f5dd85f557aed.tar.xz kernel-qcow2-linux-40a3426c75e1621ee6d88be2352f5dd85f557aed.zip | |
NFSv4: Clean up encode_attrs
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs/nfs4xdr.c')
| -rw-r--r-- | fs/nfs/nfs4xdr.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 80c5b519fd6a..3d088230c975 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -1052,9 +1052,7 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, int owner_namelen = 0; int owner_grouplen = 0; __be32 *p; - unsigned i; uint32_t len = 0; - uint32_t bmval_len; uint32_t bmval[3] = { 0 }; /* @@ -1123,19 +1121,8 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, bmval[2] |= FATTR4_WORD2_SECURITY_LABEL; } - if (bmval[2] != 0) - bmval_len = 3; - else if (bmval[1] != 0) - bmval_len = 2; - else - bmval_len = 1; - - p = reserve_space(xdr, 4 + (bmval_len << 2) + 4 + len); - - *p++ = cpu_to_be32(bmval_len); - for (i = 0; i < bmval_len; i++) - *p++ = cpu_to_be32(bmval[i]); - *p++ = cpu_to_be32(len); + xdr_encode_bitmap4(xdr, bmval, ARRAY_SIZE(bmval)); + xdr_stream_encode_opaque_inline(xdr, (void **)&p, len); if (bmval[0] & FATTR4_WORD0_SIZE) p = xdr_encode_hyper(p, iap->ia_size); |