[71/88] SQUASHME: pnfsblock: no callback ops

Commit Message

Jim Rees June 7, 2011, 5:34 p.m. UTC

From: Benny Halevy <[e-mail]>

Signed-off-by: Benny Halevy <[e-mail]>
---
 fs/nfs/blocklayout/blocklayout.c |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

Patch

diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
index 071e7ef..5dbd9c6 100644
--- a/fs/nfs/blocklayout/blocklayout.c
+++ b/fs/nfs/blocklayout/blocklayout.c
@@ -44,7 +44,6 @@  MODULE_AUTHOR("Andy Adamson <[e-mail]>");
 MODULE_DESCRIPTION("The NFSv4.1 pNFS Block layout driver");
 
 /* Callback operations to the pNFS client */
-static struct pnfs_client_operations *pnfs_block_callback_ops;
 
 static void print_page(struct page *page)
 {
@@ -199,7 +198,7 @@  static void bl_read_cleanup(struct work_struct *work)
 	dprintk("%s enter\n", __func__);
 	task = container_of(work, struct rpc_task, u.tk_work);
 	rdata = container_of(task, struct nfs_read_data, task);
-	pnfs_block_callback_ops->nfs_readlist_complete(rdata);
+	pnfs_read_done(rdata);
 }
 
 static void
@@ -411,7 +410,7 @@  static void bl_write_cleanup(struct work_struct *work)
 		mark_extents_written(BLK_LSEG2EXT(wdata->pdata.lseg),
 				     wdata->args.offset, wdata->args.count);
 	}
-	pnfs_block_callback_ops->nfs_writelist_complete(wdata);
+	pnfs_writeback_done(wdata);
 }
 
 /* Called when last of bios associated with a bl_write_pagelist call finishes */
@@ -733,7 +732,7 @@  nfs4_blk_get_deviceinfo(struct nfs_server *server, const struct nfs_fh *fh,
 	dev->mincount = 0;
 
 	dprintk("%s: dev_id: %s\n", __func__, dev->dev_id.data);
-	rc = pnfs_block_callback_ops->nfs_getdeviceinfo(server, dev);
+	rc = nfs4_proc_getdeviceinfo(server, dev);
 	dprintk("%s getdevice info returns %d\n", __func__, rc);
 	if (rc)
 		goto out_free;
@@ -783,8 +782,7 @@  bl_initialize_mountpoint(struct nfs_server *server, const struct nfs_fh *fh)
 		goto out_error;
 	dlist->eof = 0;
 	while (!dlist->eof) {
-		status = pnfs_block_callback_ops->nfs_getdevicelist(
-							server, fh, dlist);
+		status = nfs4_proc_getdevicelist(server, fh, dlist);
 		if (status)
 			goto out_error;
 		dprintk("%s GETDEVICELIST numdevs=%i, eof=%i\n",
@@ -1140,11 +1138,14 @@  static struct pnfs_layoutdriver_type blocklayout_type = {
 
 static int __init nfs4blocklayout_init(void)
 {
+	int ret;
+
 	dprintk("%s: NFSv4 Block Layout Driver Registering...\n", __func__);
 
-	pnfs_block_callback_ops = pnfs_register_layoutdriver(&blocklayout_type);
-	bl_pipe_init();
-	return 0;
+	ret = pnfs_register_layoutdriver(&blocklayout_type);
+	if (!ret)
+		bl_pipe_init();
+	return ret;
 }
 
 static void __exit nfs4blocklayout_exit(void)