From patchwork Sat Feb 18 19:12:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9581191 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B2B976049F for ; Sat, 18 Feb 2017 19:12:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A4F69286AE for ; Sat, 18 Feb 2017 19:12:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 999BE286DB; Sat, 18 Feb 2017 19:12:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57897286AE for ; Sat, 18 Feb 2017 19:12:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753550AbdBRTM4 (ORCPT ); Sat, 18 Feb 2017 14:12:56 -0500 Received: from mail-it0-f68.google.com ([209.85.214.68]:32938 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753998AbdBRTMz (ORCPT ); Sat, 18 Feb 2017 14:12:55 -0500 Received: by mail-it0-f68.google.com with SMTP id e137so6808352itc.0 for ; Sat, 18 Feb 2017 11:12:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=zA8APHU+ql2B3YgU4HJEdxMelMiHA0PVar34fwQtclM=; b=cYUcsc7jyoZDSIZGZxMxSsev6aqYaZCaf+YjiUfgbSK4ePSP5VrN/HY1HEI7Wd26nB VsY0v/QjlQx1o/4PHIAf9ln6of6tdeVqA75Ku9uF+B7JNpY63ZQ1n8IpR2GFAMz4ZtjV jPU7OB8AKAlIuPGfEMxz07fG6JNs3b4aFlmXSQLXxW3QPUYI2AfWb9DVwQBPLb2Dwwyb Yz+/Ool89OnWLW6oP1X9vAG9TXCZx7G8CnxZNUWUJaCy6EFNolq7Tgu9K2lR0t7HZtxl EyJ96t645oocL3411KS23TfU+HydWDyqMotsDadYw0k1ZJQQBRnI+dXVyRaLhG+xBipv vgAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=zA8APHU+ql2B3YgU4HJEdxMelMiHA0PVar34fwQtclM=; b=OOZQIpxNv7msLreQNvuXMS5BneTTF96KtNBl2LQxUx2lZEeYISztvlYsrAGkRVZ74c LLeXlzq0oClxig3obEzWFCtK0KNxdryWia3jAghru+bY8p3i7TzlK8bc1/brJtUmDvHH VthddZSmGXqE04/5VpknpP/rZcWdZyaNqxq0nhSmOwvDoZzmyoUuH6rHfTtWziQpaSgz P4X45+LHCeYo8iDSrMvk4HdplRJKDUIOn1j5uv5tFz+zdpf6Tn6xQagt6iWwOrxeunSX kgwJdyzsU7H88KiR2AY+3sX1Pn6er7lTUM8l4412/BKvMFN8JzXtdnbuQDsAkmZ8HBj7 52wg== X-Gm-Message-State: AMke39kpZS5CoDk65nL+85wiAUoPqlPwqcZ7AQ7dC52A2j+RYZt4yIszjTi6ZrJypa5w2g== X-Received: by 10.36.4.69 with SMTP id 66mr3679102itb.120.1487445174437; Sat, 18 Feb 2017 11:12:54 -0800 (PST) Received: from localhost.localdomain ([50.124.63.84]) by smtp.gmail.com with ESMTPSA id 35sm6823174ior.50.2017.02.18.11.12.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Feb 2017 11:12:53 -0800 (PST) From: Trond Myklebust To: Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v3 4/4] NFSv4: Remove bogus "struct nfs_client" argument from decode_ace() Date: Sat, 18 Feb 2017 14:12:46 -0500 Message-Id: <20170218191246.32687-5-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170218191246.32687-4-trond.myklebust@primarydata.com> References: <20170218191246.32687-1-trond.myklebust@primarydata.com> <20170218191246.32687-2-trond.myklebust@primarydata.com> <20170218191246.32687-3-trond.myklebust@primarydata.com> <20170218191246.32687-4-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We shouldn't need to force callers to carry an unused argument. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4xdr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 7510a0cd93fa..dbb765fb4180 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -3125,7 +3125,7 @@ static int decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected) } /* Dummy routine */ -static int decode_ace(struct xdr_stream *xdr, void *ace, struct nfs_client *clp) +static int decode_ace(struct xdr_stream *xdr, void *ace) { __be32 *p; unsigned int strlen; @@ -5073,7 +5073,7 @@ static int decode_rw_delegation(struct xdr_stream *xdr, if (decode_space_limit(xdr, &res->pagemod_limit) < 0) return -EIO; } - return decode_ace(xdr, NULL, res->server->nfs_client); + return decode_ace(xdr, NULL); out_overflow: print_overflow_msg(__func__, xdr); return -EIO;