From patchwork Tue May 16 13:36:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9729225 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 6D75160386 for ; Tue, 16 May 2017 13:36:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6098628A24 for ; Tue, 16 May 2017 13:36:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5556728A26; Tue, 16 May 2017 13:36:38 +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 BFB6828A24 for ; Tue, 16 May 2017 13:36:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753072AbdEPNgg (ORCPT ); Tue, 16 May 2017 09:36:36 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:34928 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752373AbdEPNgg (ORCPT ); Tue, 16 May 2017 09:36:36 -0400 Received: by mail-io0-f196.google.com with SMTP id o12so14460395iod.2 for ; Tue, 16 May 2017 06:36:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=Cfei3lZbpf9OC7y5jkZ352EQQy0dT7XeOSDj7r/X9b8=; b=CIMYcQlQh2nM1sHIpELfjD31fO+xkmZ/ic4zYwGCYhDZ45hRk6FaAOStfSvNCycLOv cY1VMa6aVl2ppcijBvNcSK/o5OJoN9595XaxCVoosas8dX6KVUUFoAXiijuPb+FnpdGj 39BtnIaT+BVjDv1gstRM2cT8VbxJ4OBjLr16FrWGtGHFEVL5y8hbGVBGerfV+grw55UY BOBKJAvkZWvmg5qzc6sUcAwY15fLDXJywNU7x3gO7ziUnNjyheZvam5PllYQFEBHEG/h a6eC7wlBiD/3yPDiA+V4FiKsnZQeshHnnvfV5v9H/WaIhVsZIMeOOJA1dH9Kfo4Otd7j Q+Tg== 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:subject:date:message-id :in-reply-to:references; bh=Cfei3lZbpf9OC7y5jkZ352EQQy0dT7XeOSDj7r/X9b8=; b=g+blSo7e6FxeHceeb0+UReDa/j6MurRyYWf4InHzEUtudPV1znDmNcFgUSRlzgjy3k LaHiwLCyQN5SxztCYAfe88Y/fBEbM2894TVrwb8opwhqNkrpzCxf6miunCXhrwMxtC9h EDQ1a8S7Ulk4TsmnZWXEGh6VL1fVOx5tbY/xm6UIrnG0S7tcx1DaQ8pkSHe8fj37mZDi eLTgkZxn6CGdDnlbFiLYmUv3H9C1+ny2YSvi2vaU2K3o4G0NuGBiK/ibPYC30OnaJwEp kO9sEjjNNnInzbS3/zKjQj7pzQqyKUBKv1SZdk05C8nnOdroEAI1dZYT9IQYPzEn0Zy1 c6lg== X-Gm-Message-State: AODbwcCsJ/+em3QDF8xrMMazjsXhHFlVO8oGbBQvRK9BqvwIR/nVr/1V bxwKFHCTeXMuDcxTm4U= X-Received: by 10.107.158.144 with SMTP id h138mr10243325ioe.212.1494941794979; Tue, 16 May 2017 06:36:34 -0700 (PDT) Received: from localhost.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id t184sm2245436iod.29.2017.05.16.06.36.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 May 2017 06:36:34 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 1/3] NFS: Remove unused fields in the page I/O structures Date: Tue, 16 May 2017 09:36:26 -0400 Message-Id: <20170516133628.16525-2-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170516133628.16525-1-trond.myklebust@primarydata.com> References: <20170516133628.16525-1-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 Remove the 'layout_private' fields that were only used by the pNFS OSD layout driver. Signed-off-by: Trond Myklebust --- fs/nfs/pagelist.c | 2 -- include/linux/nfs_page.h | 1 - include/linux/nfs_xdr.h | 1 - 3 files changed, 4 deletions(-) diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index ad92b401326c..de107d866297 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -51,7 +51,6 @@ void nfs_pgheader_init(struct nfs_pageio_descriptor *desc, hdr->io_start = req_offset(hdr->req); hdr->good_bytes = mirror->pg_count; hdr->dreq = desc->pg_dreq; - hdr->layout_private = desc->pg_layout_private; hdr->release = release; hdr->completion_ops = desc->pg_completion_ops; if (hdr->completion_ops->init_hdr) @@ -711,7 +710,6 @@ void nfs_pageio_init(struct nfs_pageio_descriptor *desc, desc->pg_error = 0; desc->pg_lseg = NULL; desc->pg_dreq = NULL; - desc->pg_layout_private = NULL; desc->pg_bsize = bsize; desc->pg_mirror_count = 1; diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index 247cc3d3498f..6138cf91346b 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h @@ -94,7 +94,6 @@ struct nfs_pageio_descriptor { const struct nfs_pgio_completion_ops *pg_completion_ops; struct pnfs_layout_segment *pg_lseg; struct nfs_direct_req *pg_dreq; - void *pg_layout_private; unsigned int pg_bsize; /* default bsize for mirrors */ u32 pg_mirror_count; diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index b28c83475ee8..ee998ed08cf6 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -1436,7 +1436,6 @@ struct nfs_pgio_header { const struct nfs_pgio_completion_ops *completion_ops; const struct nfs_rw_ops *rw_ops; struct nfs_direct_req *dreq; - void *layout_private; spinlock_t lock; /* fields protected by lock */ int pnfs_error;