Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp5777437pxb; Mon, 14 Feb 2022 07:24:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJxDeU6hCs2K7hzexZHGTYryW5UThn+rFVNH2nSiyi2hErhvizqGls3ikRHezjj/PJArWhy9 X-Received: by 2002:a17:902:e88b:: with SMTP id w11mr213026plg.161.1644852250466; Mon, 14 Feb 2022 07:24:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644852250; cv=none; d=google.com; s=arc-20160816; b=oSrNTvrbmuwzA0mw5GomekauTm2VNt2CVocA/z9AEsMItFALCL/p0NoTjI+Jd28M6Z XB5x7q1mwTI6cS1SmYbfhKiF4Biy84ETRjfgjmfdGILtsCo5MFQBVfazo8bsqr2f3lxQ +PGC/x1nyQTtiE1+PrURJWpSevtwTWw28xyAa3VmPBZGlcmUKyRmBGywcsMekp9F6Axb Uwt1pC0XVA0qxArOvq+uTWhYvHcWh7JHUO4UwgtFkSC5A5o9G/OjWHOU0smaIba590HY 45vmNBqCLukJQBMjr7VFu4LydmVgFCvn/bBczDZNSRcBvWRrv21HGrsDI1abxTysELB2 y4jA== 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:subject:cc:to :from:dkim-signature; bh=GzAfGYcj2fUG1Ou7Y2/13HE/pwH/wp6SW3jim+9iMsU=; b=zli9cFZUrjdn+aDlvQ8b1ST6GysmXT3cwJNlTZicIKDbrkRxMwibhczC+l3REbd25H bzKsFf7mqtxEvmCztORoSSBT41RJgI8Q+2qzz6ZyrXM/QqbCopjjAl8MiWtEi4vOoOUT 251HOK1m6kJT7I4X3niKz4XGP/nNrDATlfdF/sjtuOUn72pXRpEq57212gYBEBxyqnme Nh+l4rPNBFNUdaLxwM3Uh+zNoTkUrkMFpfNv3qQbqUwf2SAEWY4fPaEHSHILAzEGZGsy aAJkN5tht2alRGMm1GCNKXdyegGtO97ckqMNrHPwhA+ny0U+9vkVRiWQoj7FgXNjPVaV gSOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FP+83ngU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h125si31490814pgc.280.2022.02.14.07.23.54; Mon, 14 Feb 2022 07:24:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FP+83ngU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244324AbiBNJjC (ORCPT + 99 others); Mon, 14 Feb 2022 04:39:02 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:52454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244287AbiBNJhA (ORCPT ); Mon, 14 Feb 2022 04:37:00 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C238465821; Mon, 14 Feb 2022 01:35:01 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8F30F6115B; Mon, 14 Feb 2022 09:34:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F8D8C340EF; Mon, 14 Feb 2022 09:34:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1644831299; bh=SeVxQyNtXy9Wp9rjGaTR1rfv/6g68X9HcuZxVVLKI+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FP+83ngU7G45IeyhqaPfiRXQT0SA+5wDjXpV5Xj2wy/PHsV+F0KkSzcoGnLhSG91V +2UDEPWDU39iiZyweXQQRFp3QFDgrHiBM7KBmNpYmmkJOqLqaNbYT1aP68XWz4DcOE ATJNzK2MPM0QV4HsvzU9/bwyudkZ9iKGqo8ZO7GM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chuck Lever Subject: [PATCH 5.4 10/71] NFSD: Fix offset type in I/O trace points Date: Mon, 14 Feb 2022 10:25:38 +0100 Message-Id: <20220214092452.375798520@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220214092452.020713240@linuxfoundation.org> References: <20220214092452.020713240@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chuck Lever commit 6a4d333d540041d244b2fca29b8417bfde20af81 upstream. NFSv3 and NFSv4 use u64 offset values on the wire. Record these values verbatim without the implicit type case to loff_t. Signed-off-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/trace.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h @@ -53,14 +53,14 @@ TRACE_EVENT(nfsd_compound_status, DECLARE_EVENT_CLASS(nfsd_io_class, TP_PROTO(struct svc_rqst *rqstp, struct svc_fh *fhp, - loff_t offset, - unsigned long len), + u64 offset, + u32 len), TP_ARGS(rqstp, fhp, offset, len), TP_STRUCT__entry( __field(u32, xid) __field(u32, fh_hash) - __field(loff_t, offset) - __field(unsigned long, len) + __field(u64, offset) + __field(u32, len) ), TP_fast_assign( __entry->xid = be32_to_cpu(rqstp->rq_xid); @@ -68,7 +68,7 @@ DECLARE_EVENT_CLASS(nfsd_io_class, __entry->offset = offset; __entry->len = len; ), - TP_printk("xid=0x%08x fh_hash=0x%08x offset=%lld len=%lu", + TP_printk("xid=0x%08x fh_hash=0x%08x offset=%llu len=%u", __entry->xid, __entry->fh_hash, __entry->offset, __entry->len) ) @@ -77,8 +77,8 @@ DECLARE_EVENT_CLASS(nfsd_io_class, DEFINE_EVENT(nfsd_io_class, nfsd_##name, \ TP_PROTO(struct svc_rqst *rqstp, \ struct svc_fh *fhp, \ - loff_t offset, \ - unsigned long len), \ + u64 offset, \ + u32 len), \ TP_ARGS(rqstp, fhp, offset, len)) DEFINE_NFSD_IO_EVENT(read_start);