From patchwork Tue Apr 30 22:48:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 2506511 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id DCEFEDFB75 for ; Tue, 30 Apr 2013 22:49:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933771Ab3D3WtI (ORCPT ); Tue, 30 Apr 2013 18:49:08 -0400 Received: from mail-ie0-f180.google.com ([209.85.223.180]:56033 "EHLO mail-ie0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933885Ab3D3WtH (ORCPT ); Tue, 30 Apr 2013 18:49:07 -0400 Received: by mail-ie0-f180.google.com with SMTP id to1so1311600ieb.39 for ; Tue, 30 Apr 2013 15:49:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:subject:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=clQh5GfgS0KigEcZqP0hxLG/+dZfcxjjAmr8wQnn3YM=; b=aGaXSIWpylSoZlEIHnf68aMrCtPdSf4sYNdHdn/1twBD1N5QgoZAydE39AkoObfzaK 4z7gJP3nxcZdEN3bnIp34jg/64tYBnHivCgkTB9jbAay91NxT56Z+RJaXtwJ8YlOd3Bj Cf21DtDHpJizNGG1MWHeZP2Yp2iJBewsBtFE2LYDP1OGv8bEy+74eFxILGov1Ocun9Ay 0Q/Sc2t+84l0zuobhmy+mehrArsVVPsSUEQPqTgsImS2nef8YG5l2wyXEjxKCaHH+sVX LQizZeuN4lpDhijgHE4vSfbEH597Piit2Ov+kpm/qr6lLWDk5vxL0rwU0lWxHqv1oz/n 1YeA== X-Received: by 10.50.92.4 with SMTP id ci4mr204346igb.96.1367362146986; Tue, 30 Apr 2013 15:49:06 -0700 (PDT) Received: from seurat.1015granger.net (adsl-99-26-161-222.dsl.sfldmi.sbcglobal.net. [99.26.161.222]) by mx.google.com with ESMTPSA id b6sm595495igv.5.2013.04.30.15.49.05 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 30 Apr 2013 15:49:06 -0700 (PDT) From: Chuck Lever Subject: [PATCH 1/3] NFSD: Simplify GSS flavor encoding in nfsd4_do_encode_secinfo() To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Date: Tue, 30 Apr 2013 18:48:45 -0400 Message-ID: <20130430224845.21406.96490.stgit@seurat.1015granger.net> In-Reply-To: <20130430224730.21406.27294.stgit@seurat.1015granger.net> References: <20130430224730.21406.27294.stgit@seurat.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Clean up. Signed-off-by: Chuck Lever --- fs/nfsd/nfs4xdr.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 2502951..ce327e3 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3174,17 +3174,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 {