diff options
| author | Denis Cheng <crquan@gmail.com> | 2007-10-16 23:26:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 08:42:47 -0700 |
| commit | 0cbc591bf884a5662b2fbb21b5c09fa1c1c7b579 (patch) | |
| tree | 23b5e92aaa2d8c74a4501d39275431b272341cac | |
| parent | d2c9740b499f959ed513375b6e35c2ab161921cb (diff) | |
| download | linux-0cbc591bf884a5662b2fbb21b5c09fa1c1c7b579.tar.bz2 | |
nbd: change a parameter's type to remove a memcpy call
This memcpy looks so strange, in fact it's merely a pointer dereference, so I
change the parameter's type to refer it more directly, this could make the
memcpy not needed anymore.
In the function nbd_read_stat where nbd_find_request is only once called, the
parameter served should be transformed accordingly.
Signed-off-by: Denis Cheng <crquan@gmail.com>
Cc: Paul Clements <paul.clements@steeleye.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/block/nbd.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index d7a421579908..dc88bcf320e8 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -231,14 +231,12 @@ error_out: return 1; } -static struct request *nbd_find_request(struct nbd_device *lo, char *handle) +static struct request *nbd_find_request(struct nbd_device *lo, + struct request *xreq) { struct request *req, *tmp; - struct request *xreq; int err; - memcpy(&xreq, handle, sizeof(xreq)); - err = wait_event_interruptible(lo->active_wq, lo->active_req != xreq); if (unlikely(err)) goto out; @@ -293,7 +291,7 @@ static struct request *nbd_read_stat(struct nbd_device *lo) goto harderror; } - req = nbd_find_request(lo, reply.handle); + req = nbd_find_request(lo, *(struct request **)reply.handle); if (unlikely(IS_ERR(req))) { result = PTR_ERR(req); if (result != -ENOENT) |