Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp1563676pxb; Fri, 20 Nov 2020 12:41:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJxiyC9/flSGO9wigWcIgGVhm/cEbdqlAerbdq/3tlcU4db7eiIMATAVNyDrexUdgXbbj9e5 X-Received: by 2002:a17:906:c298:: with SMTP id r24mr16615423ejz.381.1605904899987; Fri, 20 Nov 2020 12:41:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605904899; cv=none; d=google.com; s=arc-20160816; b=Rv4AL8d0kkxzlKBN0upySqAhFZZ4cB75G2A7gOCQmr+te2EpdnfouUsvifgEglOELZ c+eRw2smCG4015KfAdzD3MbXoE1KBFQlqp2BD63fO89Tz/jic26wgQonxn4e+wTAFgJ8 b9cleaZbkhEiXCxNYVf481NovArehCWLSI815/g0X/FKO+SNHbdbHm80h9SRiNtpqpvE yAYqiGOI09KKPGoTw+i8MRApPJwNY+1K3XOYSjvN/iGJc7iILxMlDjdGaXRpZ8Jb760T opYx5gBUKxcoxtHksZdS3yhaOKbx71wztjJTv3RX0ymGqywAL4uvlbKkBYStSZPfr0E2 JLYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:to:from:subject :sender:dkim-signature; bh=7EhqnswBN7VhEEUvBRTc+ME7wDXI1qjtedrZmN50LRk=; b=mtQioDIC/1Kn1r6kcbtwVhSP6owxi0XrT+ZRlN/0kB3dISQNN669ZCTIiLrn5cqW/i d+K6HsvQNJij88bLdcQVc8Tu6fRAydwSNf3iGOO6oTpJXP9zWBHM5d4Yl0VeEfpDoe8N O2T5tGe1oNqB9X/f4RRVGTeLHeAiZb+Cs/PrxG/DCNZ2P8vtHN58rsHmQ3/jZPSQordS CLBtBethmWgcx1kL+eKery0BN1gR0wp9Wl8+K1QkpjzjMMgRe26P34/T3sDOUajOWGog 4v59NgR6rfrfc2L4GafgHOVsuTYafo83sGJlwMxBhNA4o+yc1M9+XS1UwRoaSezrmFho 86Cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=TwNFurLt; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m7si2835878edq.549.2020.11.20.12.41.17; Fri, 20 Nov 2020 12:41:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=TwNFurLt; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731653AbgKTUj4 (ORCPT + 99 others); Fri, 20 Nov 2020 15:39:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731087AbgKTUj4 (ORCPT ); Fri, 20 Nov 2020 15:39:56 -0500 Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA148C0613CF for ; Fri, 20 Nov 2020 12:39:55 -0800 (PST) Received: by mail-qk1-x743.google.com with SMTP id l2so10273432qkf.0 for ; Fri, 20 Nov 2020 12:39:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:from:to:date:message-id:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=7EhqnswBN7VhEEUvBRTc+ME7wDXI1qjtedrZmN50LRk=; b=TwNFurLt6W99MXLrj7E6bPIYltWQFF/T9rFvQwjxbOjhV5yFNruQeBRgjNT6b0fguK VPJZqPhaklxw+ydgUg5A75N22RJOpqQUGzQhvwqwYU0fBmuFs5meZ+THEb6IekBp2W5E hadO0ciXjT1HR3UBhDvO0Cenr1tJQrkKlvOwt+9ULzwqD4HFXE9B1G7hjiC9NJ4FXZV5 zu9oZz48JrC4qHIZjP/neCv+tCoLX1CjApaEsoPEEfHm+/PnskmtnUmPBQUrlT9FgOI8 OjhvL2UcaLKyS01uf4qJM0OSDAM2YssCfRInVUuWoWoqaeVWiMWRX2RIpQQRG59Hq4QT DycQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:from:to:date:message-id :in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=7EhqnswBN7VhEEUvBRTc+ME7wDXI1qjtedrZmN50LRk=; b=DzGRMO+h+4l9yF67PtUp3FuOjNh0jmOjL1os2AGtnrScZogAHvGDhcyZvXJJLwfdiG giWIADZOykmXolAjnTkeQLs39xnCJENS/fXDsxdL0Efg0O1m7FH/S2g5gnE4hP7VFv2z 536rMEticOfChw9FJhZ8ERncJymFz3dsjtO/wKKuvQNzeyL2lizPJYZ4LZ4dbNz4s5Pg +0oBr1hD4qjgMUuHd52iwnxqRk5f9sEXvE8ZnIecW2zcCWLLr++AX2+Ft8/DM36pr+dD 9F1Myb4IlItHpjRQIqhcPxHE5m5vsZs7iMliZkd035To+o3ucAUj3fGfHwh5b61Hi+Sh 2s9Q== X-Gm-Message-State: AOAM530n6IX6VgD7OVzUqBaPrGyRKXhSTpSDEnCJmQY9oRSneYS1WTqv NC6OuSjh/1sNCUetdEE7mMsuungGZ3s= X-Received: by 2002:a37:6287:: with SMTP id w129mr10194170qkb.261.1605904794825; Fri, 20 Nov 2020 12:39:54 -0800 (PST) Received: from gateway.1015granger.net (c-68-61-232-219.hsd1.mi.comcast.net. [68.61.232.219]) by smtp.gmail.com with ESMTPSA id c199sm2822441qke.111.2020.11.20.12.39.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Nov 2020 12:39:54 -0800 (PST) Sender: Chuck Lever Received: from klimt.1015granger.net (klimt.1015granger.net [192.168.1.55]) by gateway.1015granger.net (8.14.7/8.14.7) with ESMTP id 0AKKdruB029410 for ; Fri, 20 Nov 2020 20:39:53 GMT Subject: [PATCH v2 069/118] NFSD: Replace READ* macros in nfsd4_decode_destroy_clientid() From: Chuck Lever To: linux-nfs@vger.kernel.org Date: Fri, 20 Nov 2020 15:39:53 -0500 Message-ID: <160590479311.1340.834493651502484558.stgit@klimt.1015granger.net> In-Reply-To: <160590425404.1340.8850646771948736468.stgit@klimt.1015granger.net> References: <160590425404.1340.8850646771948736468.stgit@klimt.1015granger.net> User-Agent: StGit/0.23-29-ga622f1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Chuck Lever --- fs/nfsd/nfs4xdr.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index c6301393c422..6bfc9f69c660 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1679,16 +1679,6 @@ nfsd4_decode_free_stateid(struct nfsd4_compoundargs *argp, return nfsd4_decode_stateid4(argp, &free_stateid->fr_stateid); } -static __be32 nfsd4_decode_destroy_clientid(struct nfsd4_compoundargs *argp, struct nfsd4_destroy_clientid *dc) -{ - DECODE_HEAD; - - READ_BUF(8); - COPYMEM(&dc->clientid, 8); - - DECODE_TAIL; -} - static __be32 nfsd4_decode_reclaim_complete(struct nfsd4_compoundargs *argp, struct nfsd4_reclaim_complete *rc) { DECODE_HEAD; @@ -1848,6 +1838,12 @@ nfsd4_decode_test_stateid(struct nfsd4_compoundargs *argp, struct nfsd4_test_sta return nfs_ok; } +static __be32 nfsd4_decode_destroy_clientid(struct nfsd4_compoundargs *argp, + struct nfsd4_destroy_clientid *dc) +{ + return nfsd4_decode_clientid4(argp, &dc->clientid); +} + static __be32 nfsd4_decode_fallocate(struct nfsd4_compoundargs *argp, struct nfsd4_fallocate *fallocate)