From: Benny Halevy <bhalevy@panasas.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH 12/15] SQUASHME: pnfsblock: no callback ops
Date: Wed, 29 Sep 2010 13:11:40 +0200 [thread overview]
Message-ID: <1285758700-27156-1-git-send-email-bhalevy@panasas.com> (raw)
In-Reply-To: <4CA31DC3.8070300@panasas.com>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
---
fs/nfs/blocklayout/blocklayout.c | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
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 <andros@citi.umich.edu>");
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)
--
1.7.2.3
next prev parent reply other threads:[~2010-09-29 11:11 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-30 16:34 pnfs git tree status pnfs-all-2.6.36-rc3-2010-08-30 Benny Halevy
2010-08-30 16:43 ` [PATCH 1/2] SQUASHME: pnfs-submit: do not use NIPQUAD in nfs4_callback_layoutrecall dprintk Benny Halevy
2010-08-30 16:43 ` [PATCH 2/2] SQUASHME: pnfs-submit: get machince creds for getdeviceinfo Benny Halevy
2010-08-30 16:44 ` [PATCH 3/3] SQUASHME: pnfs: get machince creds for getdevicelist Benny Halevy
2010-08-30 16:44 ` [PATCH 4/4] SQUASHME: pnfs-obj use REQ flags rather than BIO flags Benny Halevy
2010-09-29 11:06 ` pnfs git tree status pnfs-all-2.6.36-rc6-2010-09-29 Benny Halevy
2010-09-29 11:09 ` [PATCH 1/5] SQUASHME: pnfs-submit: add missing include file in nfs4filelayoutdev.c Benny Halevy
2010-09-29 11:09 ` [PATCH 2/5] SQUASHME: move nfs4_deviceid definitions to include/linux/nfs4.h Benny Halevy
2010-09-29 11:09 ` [PATCH 3/5] SQUASHME: pnfs-submit: handle non-pnfs case in set_pnfs_layoutdriver Benny Halevy
2010-09-29 11:10 ` [PATCH 4/5] pnfs-submit: file needs layout commit, server attributes may be stale Benny Halevy
2010-09-29 11:10 ` [PATCH 5/5] NFS: clear fsinfo before sendign rpc Benny Halevy
2010-10-13 18:03 ` Fred Isaman
2010-10-13 20:34 ` Benny Halevy
2010-10-13 20:54 ` Trond Myklebust
2010-10-13 21:13 ` Benny Halevy
2010-10-13 21:20 ` Trond Myklebust
[not found] ` <1287004813.3015.212.camel-rJ7iovZKK19ZJLDQqaL3InhyD016LWXt@public.gmane.org>
2010-10-13 21:27 ` Benny Halevy
2010-09-29 11:10 ` [PATCH 6/9] pnfs: alloc and free layout_hdr layoutdriver methods Benny Halevy
2010-09-29 11:10 ` [PATCH 7/9] pnfs: allow nfs4_proc_layoutget to sleep on invalid lsegs Benny Halevy
2010-09-29 11:10 ` [PATCH 8/9] SQUASHME: pnfs: refactor put_lseg{_locked} Benny Halevy
2010-09-29 11:11 ` [PATCH 9/9] SQUASHME: pnfs: get rid of lo_waitq Benny Halevy
2010-09-29 11:11 ` [PATCH 10/15] SQUASHME: pnfsblock: remove obsolete include file from blocklayout.h Benny Halevy
2010-09-29 11:11 ` [PATCH 11/15] SQUASHME: pnfsblock: use nfs4_deviceid Benny Halevy
2010-09-29 11:11 ` Benny Halevy [this message]
2010-09-29 11:11 ` [PATCH 13/15] SQAUSHME: pnfsblock: no PNFS_NFS_SERVER Benny Halevy
2010-09-29 11:12 ` [PATCH 14/15] SQUASHME: pnfsblock: no dev_notify_types Benny Halevy
2010-09-29 11:12 ` [PATCH 15/15] SQUASHME: pnfsblock: use new struct pnfs_layout_hdr Benny Halevy
2010-09-29 11:12 ` [PATCH 16/17] SQUASHME: pnfs-obj: fix REQ flags usage Benny Halevy
2010-09-29 11:12 ` [PATCH 17/17] SQUASHME: pnfs-obj: convert to new pnfs-submit changes Benny Halevy
2010-09-29 11:12 ` [PATCH 18/18] SQUASHME: pnfsd-exofs: " Benny Halevy
2010-09-29 11:17 ` pnfs git tree status pnfs-all-2.6.36-rc6-2010-09-29 Benny Halevy
2010-09-29 11:18 ` [PATCH] pnfs: get layout in proper segments Benny Halevy
2010-09-29 14:07 ` pnfs git tree status pnfs-all-2.6.36-rc6-2010-09-29 Tigran Mkrtchyan
2010-09-29 14:09 ` Tigran Mkrtchyan
2010-09-29 14:22 ` Benny Halevy
2010-09-29 14:36 ` Tigran Mkrtchyan
2010-09-29 15:25 ` Benny Halevy
2010-09-29 16:57 ` Tigran Mkrtchyan
2010-09-29 18:35 ` Fred Isaman
2010-09-30 7:58 ` Tigran Mkrtchyan
2010-09-30 8:29 ` Benny Halevy
2010-09-30 8:30 ` Benny Halevy
2010-09-30 9:12 ` Tigran Mkrtchyan
2010-09-30 9:17 ` Benny Halevy
2010-09-30 21:37 ` pnfs-all-2.6.36-rc6-2010-09-30 Benny Halevy
2010-09-30 22:23 ` pnfs git tree status pnfs-all-2.6.36-rc6-2010-09-29 Marc Eshel
2010-10-01 4:17 ` pNFS DS session Marc Eshel
2010-10-01 6:12 ` Tigran Mkrtchyan
2010-10-01 8:47 ` Boaz Harrosh
2010-10-01 12:33 ` Benny Halevy
2010-10-01 15:40 ` Marc Eshel
2010-10-01 17:10 ` J. Bruce Fields
2010-10-01 18:00 ` Marc Eshel
2010-10-01 18:14 ` J. Bruce Fields
2010-10-01 18:29 ` Andy Adamson
2010-10-03 14:55 ` Boaz Harrosh
[not found] ` <4CA3C1E2.2050701@RedHat.com>
2010-09-30 8:26 ` pnfs git tree status pnfs-all-2.6.36-rc6-2010-09-29 Benny Halevy
2010-10-28 13:36 ` pnfs git tree status pnfs-all-2.6.36-2010-10-28 Benny Halevy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1285758700-27156-1-git-send-email-bhalevy@panasas.com \
--to=bhalevy@panasas.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).