Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed9411a0 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

NFSD: Simplify GSS flavor encoding in nfsd4_do_encode_secinfo() 



Clean up.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent c8c797f9

fs/nfsd/nfs4xdr.c

+1 −7
Original line number Diff line number Diff line
@@ -3119,17 +3119,11 @@ nfsd4_do_encode_secinfo(struct nfsd4_compoundres *resp, 
		struct rpcsec_gss_info info;



		if (rpcauth_get_gssinfo(flavs[i].pseudoflavor, &info) == 0) {

			RESERVE_SPACE(4);

			RESERVE_SPACE(4 + 4 + info.oid.len + 4 + 4);

			WRITE32(RPC_AUTH_GSS);

			ADJUST_ARGS();

			RESERVE_SPACE(4 + info.oid.len);

			WRITE32(info.oid.len);

			WRITEMEM(info.oid.data, info.oid.len);

			ADJUST_ARGS();

			RESERVE_SPACE(4);

			WRITE32(info.qop);

			ADJUST_ARGS();

			RESERVE_SPACE(4);

			WRITE32(info.service);

			ADJUST_ARGS();

		} else {