From patchwork Fri Feb 8 21:27:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 2118751 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 DECDADFE75 for ; Fri, 8 Feb 2013 21:27:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1947150Ab3BHV15 (ORCPT ); Fri, 8 Feb 2013 16:27:57 -0500 Received: from mail-ia0-f179.google.com ([209.85.210.179]:44015 "EHLO mail-ia0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1947146Ab3BHV14 (ORCPT ); Fri, 8 Feb 2013 16:27:56 -0500 Received: by mail-ia0-f179.google.com with SMTP id x24so4681321iak.24 for ; Fri, 08 Feb 2013 13:27:56 -0800 (PST) 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=1xTV5qab1IfSMlaV1nsfMS7KDvBBOpY9kDG4hG+v8bc=; b=NEh9k0LCsV/+sYEU5v+lIITuoTayhHFXktSEuk3ZsnM5O6VDAjURUFWAMWrtH8kc4I w12WLX8+zPEan0up6BvEzmuQ25vD0udS3d46z2PW/DrI+OJTYyBxpHye2bXuG55EqFtu gsHUn20rmXt9LEjDorcloSNqifz7ZUi66tmSyZMk1W/0MumAjR6bTKbN+Sj4D8bPSBbe GiNeJCrog0KiDIMEuG6vEL09zAg+6JpecmMOtZnupmecGcTJsOxpISC02S7r86U5WCq7 MWO0yOxDmoNnkTxMrDfm8TAW2KxxtxDxDLv3uYO7S91/sIYQeYqMCUrColC0egPZqGmI KIIA== X-Received: by 10.50.212.38 with SMTP id nh6mr3217898igc.72.1360358876130; Fri, 08 Feb 2013 13:27:56 -0800 (PST) Received: from seurat.1015granger.net (adsl-99-26-161-222.dsl.sfldmi.sbcglobal.net. [99.26.161.222]) by mx.google.com with ESMTPS id eg7sm15817086igc.7.2013.02.08.13.27.55 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 08 Feb 2013 13:27:55 -0800 (PST) From: Chuck Lever Subject: [PATCH v1 1/3] NFSD: Simplify GSS flavor encoding in nfsd4_do_encode_secinfo() To: linux-nfs@vger.kernel.org Cc: Chuck Lever Date: Fri, 08 Feb 2013 16:27:54 -0500 Message-ID: <20130208212753.2234.91110.stgit@seurat.1015granger.net> In-Reply-To: <20130208212007.2234.35721.stgit@seurat.1015granger.net> References: <20130208212007.2234.35721.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 424f5a2..0c1ae2c 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3163,17 +3163,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 {