Skip to content

Commit

Permalink
Staging: hv: vmbus: Cleanup error values in ringbuffer.c
Browse files Browse the repository at this point in the history
Use standard Linux errno values in ringbuffer.c and do the associated
cleanup in the clients.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Aug 25, 2011
1 parent 176fb9e commit d2598f0
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/hv/blkvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/netvsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ static void netvsc_send_recv_completion(struct hv_device *device,
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"
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/hv/ring_buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/storvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
/* 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) {
Expand Down

0 comments on commit d2598f0

Please sign in to comment.