From: Peng Tao <bergwolf@gmail.com>
To: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: linux-nfs@vger.kernel.org, mdw@umich.edu, honey@citi.umich.edu,
Peng Tao <peng_tao@emc.com>, Benny Halevy <bhalevy@tonian.com>
Subject: [PATCH-v2 5/9] pnfsblock: remove rpc_call_ops from struct parallel_io
Date: Thu, 12 Jan 2012 23:18:44 +0800 [thread overview]
Message-ID: <1326381528-2232-6-git-send-email-bergwolf@gmail.com> (raw)
In-Reply-To: <1326381528-2232-1-git-send-email-bergwolf@gmail.com>
block layout can just make use of generic read/write_done.
Signed-off-by: Peng Tao <peng_tao@emc.com>
Signed-off-by: Benny Halevy <bhalevy@tonian.com>
---
fs/nfs/blocklayout/blocklayout.c | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
index 883bb27..7fc69c9 100644
--- a/fs/nfs/blocklayout/blocklayout.c
+++ b/fs/nfs/blocklayout/blocklayout.c
@@ -90,7 +90,6 @@ static int is_writable(struct pnfs_block_extent *be, sector_t isect)
*/
struct parallel_io {
struct kref refcnt;
- struct rpc_call_ops call_ops;
void (*pnfs_callback) (void *data);
void *data;
};
@@ -221,14 +220,6 @@ bl_end_par_io_read(void *data)
schedule_work(&rdata->task.u.tk_work);
}
-/* We don't want normal .rpc_call_done callback used, so we replace it
- * with this stub.
- */
-static void bl_rpc_do_nothing(struct rpc_task *task, void *calldata)
-{
- return;
-}
-
static enum pnfs_try_status
bl_read_pagelist(struct nfs_read_data *rdata)
{
@@ -248,8 +239,6 @@ bl_read_pagelist(struct nfs_read_data *rdata)
par = alloc_parallel(rdata);
if (!par)
goto use_mds;
- par->call_ops = *rdata->mds_ops;
- par->call_ops.rpc_call_done = bl_rpc_do_nothing;
par->pnfs_callback = bl_end_par_io_read;
/* At this point, we can no longer jump to use_mds */
@@ -559,8 +548,6 @@ bl_write_pagelist(struct nfs_write_data *wdata, int sync)
par = alloc_parallel(wdata);
if (!par)
return PNFS_NOT_ATTEMPTED;
- par->call_ops = *wdata->mds_ops;
- par->call_ops.rpc_call_done = bl_rpc_do_nothing;
par->pnfs_callback = bl_end_par_io_write;
/* At this point, have to be more careful with error handling */
--
1.7.1.262.g5ef3d
next prev parent reply other threads:[~2012-01-12 15:20 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-12 15:18 [PATCH-v2 0/9] pnfsblock patches for 3.3 post-rc1 Peng Tao
2012-01-12 15:18 ` [PATCH-v2 1/9] pnfsblock: cleanup bl_mark_sectors_init Peng Tao
2012-01-12 21:44 ` Trond Myklebust
2012-01-13 2:38 ` tao.peng
2012-01-12 15:18 ` [PATCH-v2 3/9] pnfsblock: move find lock page logic out of bl_write_pagelist Peng Tao
2012-01-12 21:44 ` Trond Myklebust
2012-01-12 15:18 ` [PATCH-v2 4/9] pnfsblock: set read/write tk_status to pnfs_error Peng Tao
2012-01-12 15:18 ` Peng Tao [this message]
2012-01-12 21:45 ` [PATCH-v2 5/9] pnfsblock: remove rpc_call_ops from struct parallel_io Trond Myklebust
2012-01-12 15:18 ` [PATCH-v2 6/9] pnfsblock: clean up _add_entry Peng Tao
2012-01-12 15:18 ` [PATCH-v2 7/9] pnfsblock: alloc short extent before submit bio Peng Tao
2012-01-12 21:45 ` Trond Myklebust
2012-01-12 15:26 ` [PATCH-v2 0/9] pnfsblock patches for 3.3 post-rc1 Peng Tao
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=1326381528-2232-6-git-send-email-bergwolf@gmail.com \
--to=bergwolf@gmail.com \
--cc=Trond.Myklebust@netapp.com \
--cc=bhalevy@tonian.com \
--cc=honey@citi.umich.edu \
--cc=linux-nfs@vger.kernel.org \
--cc=mdw@umich.edu \
--cc=peng_tao@emc.com \
/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).