From patchwork Mon Oct 1 23:49:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jorge Mora X-Patchwork-Id: 1534801 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 27A7ADFE80 for ; Mon, 1 Oct 2012 23:49:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753903Ab2JAXtG (ORCPT ); Mon, 1 Oct 2012 19:49:06 -0400 Received: from mx2.netapp.com ([216.240.18.37]:40739 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752407Ab2JAXtF (ORCPT ); Mon, 1 Oct 2012 19:49:05 -0400 X-IronPort-AV: E=Sophos;i="4.80,520,1344236400"; d="scan'208";a="696325044" Received: from smtp2.corp.netapp.com ([10.57.159.114]) by mx2-out.netapp.com with ESMTP; 01 Oct 2012 16:49:04 -0700 Received: from cyclsvl26.eng.netapp.com (cyclsvl26.eng.netapp.com [10.56.8.219]) by smtp2.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id q91Nn47s009502; Mon, 1 Oct 2012 16:49:04 -0700 (PDT) Received: from cyclsvl26.eng.netapp.com (localhost.localdomain [127.0.0.1]) by cyclsvl26.eng.netapp.com (8.13.8/8.13.8) with ESMTP id q91Nn3sC030204; Mon, 1 Oct 2012 16:49:03 -0700 Received: (from mora@localhost) by cyclsvl26.eng.netapp.com (8.13.8/8.13.8/Submit) id q91Nn3fI030203; Mon, 1 Oct 2012 16:49:03 -0700 From: Jorge Mora To: Trond.Myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, Jorge Mora Subject: [PATCH] NFS: Fix compile error Date: Mon, 1 Oct 2012 16:49:01 -0700 Message-Id: <1349135341-30170-1-git-send-email-mora@cyclsvl26.eng.netapp.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Jorge Mora Signed-off-by: Jorge Mora --- Fixes bug on Trond's testing branch fs/nfs/nfs4state.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 5c42866..2602290 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -123,10 +123,11 @@ int nfs40_discover_server_trunking(struct nfs_client *clp, }; unsigned short port; int status; + struct nfs_net *nn = net_generic(clp->cl_net, nfs_net_id); - port = nfs_callback_tcpport; + port = nn->nfs_callback_tcpport; if (clp->cl_addr.ss_family == AF_INET6) - port = nfs_callback_tcpport6; + port = nn->nfs_callback_tcpport6; status = nfs4_proc_setclientid(clp, NFS4_CALLBACK, port, cred, &clid); if (status != 0)