From patchwork Tue Jun 7 17:31:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 858402 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p57HV9tt013288 for ; Tue, 7 Jun 2011 17:31:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756761Ab1FGRbz (ORCPT ); Tue, 7 Jun 2011 13:31:55 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:51253 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755437Ab1FGRby (ORCPT ); Tue, 7 Jun 2011 13:31:54 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id 101503083A6D; Tue, 7 Jun 2011 13:31:54 -0400 (EDT) X-Virus-Scanned: amavisd-new at int-mailstore01.merit.edu Received: from int-mailstore01.merit.edu ([127.0.0.1]) by localhost (int-mailstore01.merit.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id si5QSk-fQ603; Tue, 7 Jun 2011 13:31:53 -0400 (EDT) Received: from merit.edu (host-17.subnet-17.med.umich.edu [141.214.17.17]) by int-mailstore01.merit.edu (Postfix) with ESMTPSA id 3017730852CE; Tue, 7 Jun 2011 13:31:53 -0400 (EDT) Date: Tue, 7 Jun 2011 13:31:52 -0400 From: Jim Rees To: Benny Halevy Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH 48/88] SQUASHME: pnfs-block: fix compile breakage Message-ID: <2cbda7e91a7b1e248465dade22369480cb716c61.1307464382.git.rees@umich.edu> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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 (demeter2.kernel.org [140.211.167.43]); Tue, 07 Jun 2011 17:31:57 +0000 (UTC) From: J. Bruce Fields 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 Signed-off-by: Benny Halevy --- 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 "); 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; }