[v5,25/38] SQUASHME: Revert "pnfs: set/unset layoutdriver"

Commit Message

Benny Halevy May 22, 2011, 11:59 p.m. UTC

This reverts commit 857e1d3081acad3a4db2e3506038b6a0e3f5a8cc.
---
 fs/nfs/pnfs.c |   13 +------------
 fs/nfs/pnfs.h |    4 ----
 2 files changed, 1 insertions(+), 16 deletions(-)

Patch

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);