From: J. Bruce Fields <bfields@xxxxxxxxxxxx>
fs/nfs/blocklayout/built-in.o: In function `bl_rpc_do_nothing':
/home/bfields/local/build-2.6/fs/nfs/blocklayout/blocklayout.c:219: multiple definition of `pnfs_callback_ops'
fs/nfs/nfslayoutdriver.o:/home/bfields/local/build-2.6/fs/nfs/nfs4filelayout.c:160: first defined here
The variable in the block case never seems to be used outside the one
file; so change the name and declare it static.
Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx>
---
fs/nfs/blocklayout/blocklayout.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
index 65cf104..768d8fa 100644
--- a/fs/nfs/blocklayout/blocklayout.c
+++ b/fs/nfs/blocklayout/blocklayout.c
@@ -44,7 +44,7 @@ MODULE_AUTHOR("Andy Adamson <andros@xxxxxxxxxxxxxx>");
MODULE_DESCRIPTION("The NFSv4.1 pNFS Block layout driver");
/* Callback operations to the pNFS client */
-struct pnfs_client_operations *pnfs_callback_ops;
+static struct pnfs_client_operations *pnfs_block_callback_ops;
static void print_page(struct page *page)
{
@@ -200,7 +200,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_callback_ops->nfs_readlist_complete(rdata);
+ pnfs_block_callback_ops->nfs_readlist_complete(rdata);
}
static void
@@ -414,7 +414,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_callback_ops->nfs_writelist_complete(wdata);
+ pnfs_block_callback_ops->nfs_writelist_complete(wdata);
}
/* Called when last of bios associated with a bl_write_pagelist call finishes */
@@ -739,7 +739,7 @@ nfs4_blk_get_deviceinfo(struct super_block *sb, struct nfs_fh *fh,
dev->pglen = PAGE_SIZE * max_pages;
dev->mincount = 0;
- rc = pnfs_callback_ops->nfs_getdeviceinfo(sb, dev);
+ rc = pnfs_block_callback_ops->nfs_getdeviceinfo(sb, dev);
dprintk("%s getdevice info returns %d\n", __func__, rc);
if (rc)
goto out_free;
@@ -799,7 +799,7 @@ bl_initialize_mountpoint(struct super_block *sb, struct nfs_fh *fh)
goto out_error;
dlist->eof = 0;
while (!dlist->eof) {
- status = pnfs_callback_ops->nfs_getdevicelist(sb, fh, dlist);
+ status = pnfs_block_callback_ops->nfs_getdevicelist(sb, fh, dlist);
if (status)
goto out_error;
dprintk("%s GETDEVICELIST numdevs=%i, eof=%i\n",
@@ -1186,7 +1186,7 @@ static int __init nfs4blocklayout_init(void)
{
dprintk("%s: NFSv4 Block Layout Driver Registering...\n", __func__);
- pnfs_callback_ops = pnfs_register_layoutdriver(&blocklayout_type);
+ pnfs_block_callback_ops = pnfs_register_layoutdriver(&blocklayout_type);
return 0;
}
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
