pnfs-submit: Remove unused encode_getattr_three code
Subsystems (2)
PATCH 1/2 pnfs-submit: Remove unused encode_getattr_three code
This is not used by file layout
Signed-off-by Fred Isaman <[email protected]>
--- fs/nfs/nfs4xdr.c | 29 ----------------------------- 1 files changed, 0 insertions(+), 29 deletions(-)
fs/nfs/nfs4xdr.c +0 -29
@@ -1060,35 +1060,6 @@ static void encode_getattr_two(struct xdr_stream *xdr, uint32_t bm0, uint32_t bm hdr->replen += decode_getattr_maxsz; } -static void -encode_getattr_three (struct xdr_stream *xdr, -uint32_t bm0,uint32_t bm1,uint32_t bm2, -struct compound_hdr *hdr) -{ -__be32 *p; - - p =reserve_space (xdr,4 ); - *p =cpu_to_be32 (OP_GETATTR ); -if (bm2) { - p =reserve_space (xdr,16 ); - *p++ =cpu_to_be32 (3 ); - *p++ =cpu_to_be32 (bm0); - *p++ =cpu_to_be32 (bm1); - *p =cpu_to_be32 (bm2); - }else if (bm1) { - p =reserve_space (xdr,12 ); - *p++ =cpu_to_be32 (2 ); - *p++ =cpu_to_be32 (bm0); - *p =cpu_to_be32 (bm1); - }else { - p =reserve_space (xdr,8 ); - *p++ =cpu_to_be32 (1 ); - *p =cpu_to_be32 (bm0); - } - hdr->nops++; - hdr->replen += decode_getattr_maxsz; -} -static void encode_getfattr (struct xdr_stream *xdr,const u32 * bitmask,struct compound_hdr *hdr) { encode_getattr_two(xdr, bitmask[0] & nfs4_fattr_bitmap[0],
Signature · 1 line
1.6.6.1
PATCH 2/2 pnfs-post-submit: Revert "pnfs-submit: Remove unused encode_getattr_three code"
--- fs/nfs/nfs4xdr.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-)
fs/nfs/nfs4xdr.c +29 -0
@@ -1060,6 +1060,35 @@ static void encode_getattr_two(struct xdr_stream *xdr, uint32_t bm0, uint32_t bm hdr->replen += decode_getattr_maxsz; } +static void +encode_getattr_three (struct xdr_stream *xdr, +uint32_t bm0,uint32_t bm1,uint32_t bm2, +struct compound_hdr *hdr) +{ +__be32 *p; + + p =reserve_space (xdr,4 ); + *p =cpu_to_be32 (OP_GETATTR ); +if (bm2) { + p =reserve_space (xdr,16 ); + *p++ =cpu_to_be32 (3 ); + *p++ =cpu_to_be32 (bm0); + *p++ =cpu_to_be32 (bm1); + *p =cpu_to_be32 (bm2); + }else if (bm1) { + p =reserve_space (xdr,12 ); + *p++ =cpu_to_be32 (2 ); + *p++ =cpu_to_be32 (bm0); + *p =cpu_to_be32 (bm1); + }else { + p =reserve_space (xdr,8 ); + *p++ =cpu_to_be32 (1 ); + *p =cpu_to_be32 (bm0); + } + hdr->nops++; + hdr->replen += decode_getattr_maxsz; +} +static void encode_getfattr (struct xdr_stream *xdr,const u32 * bitmask,struct compound_hdr *hdr) { encode_getattr_two(xdr, bitmask[0] & nfs4_fattr_bitmap[0],
Signature · 1 line
1.6.6.1
Re: [PATCH 2/2] pnfs-post-submit: Revert "pnfs-submit: Remove unused encode_getattr_three code"
Yeah. This actually belongs to the pnfs-block branch. I'll move it there.
Benny
Quoted 44 lines · Fred Isaman
--- fs/nfs/nfs4xdr.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-)fs/nfs/nfs4xdr.c +29
-0@@ -1060,6 +1060,35 @@ static void encode_getattr_two(struct xdr_stream *xdr, uint32_t bm0, uint32_t bm hdr->replen += decode_getattr_maxsz; } +static void +encode_getattr_three (struct xdr_stream *xdr, +uint32_t bm0,uint32_t bm1,uint32_t bm2, +struct compound_hdr *hdr) +{ +__be32 *p; + + p =reserve_space (xdr,4 ); + *p =cpu_to_be32 (OP_GETATTR ); +if (bm2) { + p =reserve_space (xdr,16 ); + *p++ =cpu_to_be32 (3 ); + *p++ =cpu_to_be32 (bm0); + *p++ =cpu_to_be32 (bm1); + *p =cpu_to_be32 (bm2); + }else if (bm1) { + p =reserve_space (xdr,12 ); + *p++ =cpu_to_be32 (2 ); + *p++ =cpu_to_be32 (bm0); + *p =cpu_to_be32 (bm1); + }else { + p =reserve_space (xdr,8 ); + *p++ =cpu_to_be32 (1 ); + *p =cpu_to_be32 (bm0); + } + hdr->nops++; + hdr->replen += decode_getattr_maxsz; +} +static void encode_getfattr (struct xdr_stream *xdr,const u32 * bitmask,struct compound_hdr *hdr) { encode_getattr_two(xdr, bitmask[0] & nfs4_fattr_bitmap[0],