Return-Path: Received: from daytona.panasas.com ([67.152.220.89]:43543 "EHLO daytona.panasas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752708Ab1EVX7v (ORCPT ); Sun, 22 May 2011 19:59:51 -0400 From: Benny Halevy To: Trond Myklebust Cc: Boaz Harrosh , linux-nfs@vger.kernel.org Subject: [PATCH v5 25/38] SQUASHME: Revert "pnfs: set/unset layoutdriver" Date: Mon, 23 May 2011 02:59:30 +0300 Message-Id: <1306108770-28844-1-git-send-email-bhalevy@panasas.com> In-Reply-To: <4DD99F9B.2040406@panasas.com> References: <4DD99F9B.2040406@panasas.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: Content-Type: text/plain MIME-Version: 1.0 This reverts commit 857e1d3081acad3a4db2e3506038b6a0e3f5a8cc. --- fs/nfs/pnfs.c | 13 +------------ fs/nfs/pnfs.h | 4 ---- 2 files changed, 1 insertions(+), 16 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 96506e7..20436a5 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -75,11 +75,8 @@ find_pnfs_driver(u32 id) void unset_pnfs_layoutdriver(struct nfs_server *nfss) { - if (nfss->pnfs_curr_ld) { - if (nfss->pnfs_curr_ld->unset_layoutdriver) - nfss->pnfs_curr_ld->unset_layoutdriver(nfss); + if (nfss->pnfs_curr_ld) module_put(nfss->pnfs_curr_ld->owner); - } nfss->pnfs_curr_ld = NULL; } @@ -118,14 +115,6 @@ set_pnfs_layoutdriver(struct nfs_server *server, u32 id) } server->pnfs_curr_ld = ld_type; - if (ld_type->set_layoutdriver && - ld_type->set_layoutdriver(server)) { - dprintk("%s: Error initializing mount point for layout driver %u.\n", - __func__, id); - module_put(ld_type->owner); - goto out_no_driver; - } - dprintk("%s: pNFS module for %u set\n", __func__, id); return; diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index f118134..7417be9 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -73,10 +73,6 @@ struct pnfs_layoutdriver_type { const u32 id; const char *name; struct module *owner; - - int (*set_layoutdriver) (struct nfs_server *); - int (*unset_layoutdriver) (struct nfs_server *); - struct pnfs_layout_segment * (*alloc_lseg) (struct pnfs_layout_hdr *layoutid, struct nfs4_layoutget_res *lgr, gfp_t gfp_flags); void (*free_lseg) (struct pnfs_layout_segment *lseg); -- 1.7.3.4