From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933461AbcBCX5L (ORCPT ); Wed, 3 Feb 2016 18:57:11 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:46447 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756741AbcBCWeX (ORCPT ); Wed, 3 Feb 2016 17:34:23 -0500 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Anna Schumaker , Trond Myklebust , Luis Henriques Subject: [PATCH 3.16.y-ckt 023/180] nfs: Fix unused variable error Date: Wed, 3 Feb 2016 22:30:29 +0000 Message-Id: <1454538786-12215-24-git-send-email-luis.henriques@canonical.com> In-Reply-To: <1454538786-12215-1-git-send-email-luis.henriques@canonical.com> References: <1454538786-12215-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.7-ckt24 -stable review patch. If anyone has any objections, please let me know. ---8<------------------------------------------------------------ From: Anna Schumaker commit 343ae531f12b046ddfe54b0aa91b11b257f0c55f upstream. inode is unused when CONFIG_SUNRPC_DEBUG=n. Signed-off-by: Anna Schumaker Signed-off-by: Trond Myklebust Signed-off-by: Luis Henriques --- fs/nfs/pagelist.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 2bd81a6d308c..a60f64d88df3 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -595,7 +595,6 @@ static void nfs_pgio_prepare(struct rpc_task *task, void *calldata) int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header *hdr, const struct rpc_call_ops *call_ops, int how, int flags) { - struct inode *inode = hdr->inode; struct rpc_task *task; struct rpc_message msg = { .rpc_argp = &hdr->args, @@ -618,8 +617,8 @@ int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header *hdr, dprintk("NFS: %5u initiated pgio call " "(req %s/%llu, %u bytes @ offset %llu)\n", hdr->task.tk_pid, - inode->i_sb->s_id, - (unsigned long long)NFS_FILEID(inode), + hdr->inode->i_sb->s_id, + (unsigned long long)NFS_FILEID(hdr->inode), hdr->args.count, (unsigned long long)hdr->args.offset);