From patchwork Fri Feb 11 01:52:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 550141 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1BI0iW1025866 for ; Fri, 11 Feb 2011 18:00:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757729Ab1BKSAn (ORCPT ); Fri, 11 Feb 2011 13:00:43 -0500 Received: from mx2.netapp.com ([216.240.18.37]:51329 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757749Ab1BKSAm (ORCPT ); Fri, 11 Feb 2011 13:00:42 -0500 X-IronPort-AV: E=Sophos;i="4.60,456,1291622400"; d="scan'208";a="517277298" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 11 Feb 2011 10:00:28 -0800 Received: from localhost.localdomain (lacsina2-lxp.hq.netapp.com [10.58.58.196] (may be forged)) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p1BI0PW5026041; Fri, 11 Feb 2011 10:00:27 -0800 (PST) From: andros@netapp.com To: bhalevy@panasas.com Cc: linux-nfs@vger.kernel.org, Andy Adamson Subject: [PATCH 01/17] SQUASHME pnfs-submit wave3 fix nfs4_ds_connect bug Date: Thu, 10 Feb 2011 20:52:34 -0500 Message-Id: <1297389170-26702-2-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1297389170-26702-1-git-send-email-andros@netapp.com> References: <1297389170-26702-1-git-send-email-andros@netapp.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 11 Feb 2011 18:00:45 +0000 (UTC) diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c index 96e9e6a..673e31e 100644 --- a/fs/nfs/nfs4filelayoutdev.c +++ b/fs/nfs/nfs4filelayoutdev.c @@ -131,13 +131,13 @@ nfs4_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds) } if ((clp->cl_exchange_flags & EXCHGID4_FLAG_MASK_PNFS) != 0) { - dprintk("%s [existing] ip=%x, port=%hu\n", __func__, - ntohl(ds->ds_ip_addr), ntohs(ds->ds_port)); - if (!is_ds_client(clp)) { status = -ENODEV; goto out_put; } + ds->ds_clp = clp; + dprintk("%s [existing] ip=%x, port=%hu\n", __func__, + ntohl(ds->ds_ip_addr), ntohs(ds->ds_port)); goto out; } @@ -155,9 +155,7 @@ nfs4_ds_connect(struct nfs_server *mds_srv, struct nfs4_pnfs_ds *ds) if (status) goto out_put; - ds->ds_clp = clp; - dprintk("%s [new] ip=%x, port=%hu\n", __func__, ntohl(ds->ds_ip_addr), ntohs(ds->ds_port)); out: