lkml.org 
[lkml]   [2011]   [Jun]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 49/77] Staging: hv: vmbus: Cleanup error values in ringbuffer.c
    Date
    Use standard Linux errno values.

    Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
    Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
    Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
    ---
    drivers/staging/hv/blkvsc_drv.c | 2 +-
    drivers/staging/hv/netvsc.c | 2 +-
    drivers/staging/hv/ring_buffer.c | 6 +++---
    drivers/staging/hv/storvsc_drv.c | 2 +-
    4 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
    index 1abe7f4..9898ea3 100644
    --- a/drivers/staging/hv/blkvsc_drv.c
    +++ b/drivers/staging/hv/blkvsc_drv.c
    @@ -727,7 +727,7 @@ static int blkvsc_do_request(struct block_device_context *blkdev,
    } else {
    ret = blkvsc_submit_request(blkvsc_req,
    blkvsc_request_completion);
    - if (ret == -1) {
    + if (ret == -EAGAIN) {
    pending = 1;
    list_add_tail(&blkvsc_req->pend_entry,
    &blkdev->pending_list);
    diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c
    index 944dcdc..c060b28 100644
    --- a/drivers/staging/hv/netvsc.c
    +++ b/drivers/staging/hv/netvsc.c
    @@ -565,7 +565,7 @@ retry_send_cmplt:
    if (ret == 0) {
    /* success */
    /* no-op */
    - } else if (ret == -1) {
    + } else if (ret == -EAGAIN) {
    /* no more room...wait a bit and attempt to retry 3 times */
    retries++;
    dev_err(&device->device, "unable to send receive completion pkt"
    diff --git a/drivers/staging/hv/ring_buffer.c b/drivers/staging/hv/ring_buffer.c
    index 42f7672..9212699 100644
    --- a/drivers/staging/hv/ring_buffer.c
    +++ b/drivers/staging/hv/ring_buffer.c
    @@ -390,7 +390,7 @@ int hv_ringbuffer_write(struct hv_ring_buffer_info *outring_info,
    /* is empty since the read index == write index */
    if (bytes_avail_towrite <= totalbytes_towrite) {
    spin_unlock_irqrestore(&outring_info->ring_lock, flags);
    - return -1;
    + return -EAGAIN;
    }

    /* Write to the ring buffer */
    @@ -450,7 +450,7 @@ int hv_ringbuffer_peek(struct hv_ring_buffer_info *Inring_info,

    spin_unlock_irqrestore(&Inring_info->ring_lock, flags);

    - return -1;
    + return -EAGAIN;
    }

    /* Convert to byte offset */
    @@ -496,7 +496,7 @@ int hv_ringbuffer_read(struct hv_ring_buffer_info *inring_info, void *buffer,
    if (bytes_avail_toread < buflen) {
    spin_unlock_irqrestore(&inring_info->ring_lock, flags);

    - return -1;
    + return -EAGAIN;
    }

    next_read_location =
    diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
    index c908fd8..1028689 100644
    --- a/drivers/staging/hv/storvsc_drv.c
    +++ b/drivers/staging/hv/storvsc_drv.c
    @@ -580,7 +580,7 @@ retry_request:
    /* Invokes the vsc to start an IO */
    ret = storvsc_do_io(dev, &cmd_request->request);

    - if (ret == -1) {
    + if (ret == -EAGAIN) {
    /* no more space */

    if (cmd_request->bounce_sgl_count) {
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-06-16 22:13    [W:4.138 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site