Commit:     0cbc591bf884a5662b2fbb21b5c09fa1c1c7b579
Parent:     d2c9740b499f959ed513375b6e35c2ab161921cb
Author:     Denis Cheng <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 16 23:26:14 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 08:42:47 2007 -0700

    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 
    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, 
    parameter served should be transformed accordingly.
    Signed-off-by: Denis Cheng <[EMAIL PROTECTED]>
    Cc: Paul Clements <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 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 d7a4215..dc88bcf 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)
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to