From patchwork Tue May 24 15:06:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boaz Harrosh X-Patchwork-Id: 812522 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 p4OF6IM9022646 for ; Tue, 24 May 2011 15:07:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754481Ab1EXPHL (ORCPT ); Tue, 24 May 2011 11:07:11 -0400 Received: from daytona.panasas.com ([67.152.220.89]:46750 "EHLO daytona.panasas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754346Ab1EXPHL (ORCPT ); Tue, 24 May 2011 11:07:11 -0400 Received: from fs2.bhalevy.com ([172.17.33.70]) by daytona.panasas.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 24 May 2011 11:07:10 -0400 From: Boaz Harrosh To: Benny Halevy , Trond Myklebust , NFS list Cc: Benny Halevy Subject: [PATCH 07/12] SQUASHME: pnfs-obj: use layout driver in global device cache Date: Tue, 24 May 2011 18:06:39 +0300 Message-Id: <1306249599-23362-1-git-send-email-bharrosh@panasas.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <4DDBC611.3050202@panasas.com> References: <4DDBC611.3050202@panasas.com> X-OriginalArrivalTime: 24 May 2011 15:07:10.0454 (UTC) FILETIME=[415B2960:01CC1A24] 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]); Tue, 24 May 2011 15:07:13 +0000 (UTC) From: Benny Halevy This is the objio_osd part of the patch: NFSv4.1: use layout driver in global device cache I have move that patch to the begining of the submit toghther with the bug fixing of the new code This here should just be squashed into the single objlayout part of the get_devic_info handling Signed-off-by: Benny Halevy --- fs/nfs/objlayout/objio_osd.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c index bcc8468..a4201d8 100644 --- a/fs/nfs/objlayout/objio_osd.c +++ b/fs/nfs/objlayout/objio_osd.c @@ -60,12 +60,12 @@ objio_free_deviceid_node(struct nfs4_deviceid_node *d) kfree(de); } -static struct objio_dev_ent *_dev_list_find(const struct nfs_client *clp, +static struct objio_dev_ent *_dev_list_find(const struct nfs_server *nfss, const struct nfs4_deviceid *d_id) { struct nfs4_deviceid_node *d; - d = nfs4_find_get_deviceid(clp, d_id); + d = nfs4_find_get_deviceid(nfss->pnfs_curr_ld, nfss->nfs_client, d_id); if (!d) return NULL; return container_of(d, struct objio_dev_ent, id_node); @@ -141,7 +141,7 @@ static struct objio_dev_ent *_device_lookup(struct pnfs_layout_hdr *pnfslay, d_id = &objio_seg->comps[comp].oc_object_id.oid_device_id; - ode = _dev_list_find(NFS_SERVER(pnfslay->plh_inode)->nfs_client, d_id); + ode = _dev_list_find(NFS_SERVER(pnfslay->plh_inode), d_id); if (ode) return ode;