Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp318799pxv; Thu, 24 Jun 2021 08:35:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQkFv5+8G/xagkLOO325ATlKq9N6Ci0u03oEaFB2gsTuUKZ7XZJ/wQBBMZ6jpH6Cuz15SZ X-Received: by 2002:a05:6402:b8c:: with SMTP id cf12mr8229289edb.198.1624548909015; Thu, 24 Jun 2021 08:35:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624548909; cv=none; d=google.com; s=arc-20160816; b=loZqN36p+1rSSUUtfBxDuzoogA1DFaNyH5+Gp91hXdpkQO/DxL0QBgZuVEHtBHFshh TIZzCR6FKiT/oVApMuUxCELfjvGc9BXWKxf+DH4cZLth14Nztsbdi3iZPWImQdqjArsn Sqco6OT5b5MUmvJOxlgX3PAf6+0AVR5vQc9w9B0KUafqpJgooOE3aD74/rVFPTvn5dr7 RSsFXzSOcclx6o/xOyCzsuSMiOUhEc8BRDRohePzJHQVRcHcT82jl/ILHG1M0MR2Op7T MzJOvQkVb8K7NOrLmfycYAhGZ5kW3Jub6f5TZL2mMDC8GPctmaH0cdgpwoR6Sy0acTAv qz4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=N1DIPxBge5DzT9XOd3tf+JmPdFZAHy3tRkvWC+ztfC4=; b=vA4bkXddl1FSpIJbNMg+D/aNfX3qTfJ2mWBDJTdrHVm2CufAzLlV8AshjHR83N3jyG KKJZ8v1CGmLxqjFphFsPxuKYtpIt417kQddFGdj3m0TlIMZCMWRGMsfZhwddPK97eiw/ JfQReW98xh3oK3g0dJ/CR1FbM9iYng+SO3sQnb7/smdAuK65kB6fobaSWB6+wAK6IZn4 alwWiCQQulDQkkTZtdHCw9UrM9Oc7fXkQW5P330gwcRUYpRRaW35Q7FBGN/BLX2mg/hf 5ULrgW8TrFvWGzPEj+F2wmkvx0tcFdwHYRSAJkwdyJTfZf9/46qA5jwB4pTTjy2BYOQz 1SlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZGWATdgL; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h8si3871027edq.325.2021.06.24.08.34.36; Thu, 24 Jun 2021 08:35:09 -0700 (PDT) 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=@redhat.com header.s=mimecast20190719 header.b=ZGWATdgL; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230087AbhFXPgp (ORCPT + 99 others); Thu, 24 Jun 2021 11:36:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:34098 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230008AbhFXPgo (ORCPT ); Thu, 24 Jun 2021 11:36:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624548864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=N1DIPxBge5DzT9XOd3tf+JmPdFZAHy3tRkvWC+ztfC4=; b=ZGWATdgLmpN0HWEP3NBoQ3W8GEhWHuUebDkIYwAN/lQjzzns58IE59XTFkHsCrFiy0JQFx TuGncYvp/LqGItgpMnIjyr3CvtTikI7of29qOE8unG4xT3/UakVadt5HESgcIsAZB+67du bhWoSuoKILSZTeotjm/9pRdY9t/lf1E= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-115-RIxrYCiSNJiiKaedC3YssQ-1; Thu, 24 Jun 2021 11:34:23 -0400 X-MC-Unique: RIxrYCiSNJiiKaedC3YssQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1DE5A801596; Thu, 24 Jun 2021 15:34:22 +0000 (UTC) Received: from dwysocha.rdu.csb (unknown [10.22.8.151]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7EBF719D7C; Thu, 24 Jun 2021 15:34:21 +0000 (UTC) From: Dave Wysochanski To: Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH] NFS: Remove unnecessary inode parameter from nfs_pageio_complete_read() Date: Thu, 24 Jun 2021 11:34:18 -0400 Message-Id: <1624548858-29971-1-git-send-email-dwysocha@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Simplify nfs_pageio_complete_read() by using the inode pointer saved inside nfs_pageio_descriptor. Signed-off-by: Dave Wysochanski --- fs/nfs/read.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/fs/nfs/read.c b/fs/nfs/read.c index d2b6dce1f99f..684a730f6670 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -74,8 +74,7 @@ void nfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, } EXPORT_SYMBOL_GPL(nfs_pageio_init_read); -static void nfs_pageio_complete_read(struct nfs_pageio_descriptor *pgio, - struct inode *inode) +static void nfs_pageio_complete_read(struct nfs_pageio_descriptor *pgio) { struct nfs_pgio_mirror *pgm; unsigned long npages; @@ -86,9 +85,9 @@ static void nfs_pageio_complete_read(struct nfs_pageio_descriptor *pgio, WARN_ON_ONCE(pgio->pg_mirror_count != 1); pgm = &pgio->pg_mirrors[0]; - NFS_I(inode)->read_io += pgm->pg_bytes_written; + NFS_I(pgio->pg_inode)->read_io += pgm->pg_bytes_written; npages = (pgm->pg_bytes_written + PAGE_SIZE - 1) >> PAGE_SHIFT; - nfs_add_stats(inode, NFSIOS_READPAGES, npages); + nfs_add_stats(pgio->pg_inode, NFSIOS_READPAGES, npages); } @@ -376,7 +375,7 @@ int nfs_readpage(struct file *file, struct page *page) ret = readpage_async_filler(&desc, page); if (!ret) - nfs_pageio_complete_read(&desc.pgio, inode); + nfs_pageio_complete_read(&desc.pgio); ret = desc.pgio.pg_error < 0 ? desc.pgio.pg_error : 0; if (!ret) { @@ -430,7 +429,7 @@ int nfs_readpages(struct file *file, struct address_space *mapping, ret = read_cache_pages(mapping, pages, readpage_async_filler, &desc); - nfs_pageio_complete_read(&desc.pgio, inode); + nfs_pageio_complete_read(&desc.pgio); read_complete: put_nfs_open_context(desc.ctx); -- 1.8.3.1