All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com
Subject: [Qemu-devel] [PATCH 2/6] qcow2: Return 0/-errno in write_l2_entries
Date: Tue,  6 Apr 2010 15:30:10 +0200	[thread overview]
Message-ID: <1270560614-31030-3-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1270560614-31030-1-git-send-email-kwolf@redhat.com>

Change write_l2_entries to return the real error code instead of -1.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2-cluster.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 9b3d686..65b16db 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -627,12 +627,13 @@ static int write_l2_entries(BDRVQcowState *s, uint64_t *l2_table,
     int start_offset = (8 * l2_index) & ~511;
     int end_offset = (8 * (l2_index + num) + 511) & ~511;
     size_t len = end_offset - start_offset;
+    int ret;
 
     BLKDBG_EVENT(s->hd, BLKDBG_L2_UPDATE);
-    if (bdrv_pwrite(s->hd, l2_offset + start_offset, &l2_table[l2_start_index],
-        len) != len)
-    {
-        return -1;
+    ret = bdrv_pwrite(s->hd, l2_offset + start_offset,
+        &l2_table[l2_start_index], len);
+    if (ret < 0) {
+        return ret;
     }
 
     return 0;
-- 
1.6.6.1

  parent reply	other threads:[~2010-04-06 13:31 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-06 13:30 [Qemu-devel] [PATCH 0/6] qcow2: More error path fixes Kevin Wolf
2010-04-06 13:30 ` [Qemu-devel] [PATCH 1/6] qcow2: Don't ignore immediate read/write failures Kevin Wolf
2010-04-06 13:30 ` Kevin Wolf [this message]
2010-04-06 13:30 ` [Qemu-devel] [PATCH 3/6] qcow2: Fix error return code in qcow2_alloc_cluster_link_l2 Kevin Wolf
2010-04-06 13:30 ` [Qemu-devel] [PATCH 4/6] qcow2: Return 0/-errno in write_l1_entry Kevin Wolf
2010-04-06 13:30 ` [Qemu-devel] [PATCH 5/6] qcow2: Return 0/-errno in l2_allocate Kevin Wolf
2010-04-06 13:30 ` [Qemu-devel] [PATCH 6/6] qcow2: Remove request from in-flight list after error Kevin Wolf
2010-04-10  0:02 ` [Qemu-devel] [PATCH 0/6] qcow2: More error path fixes Aurelien Jarno
2010-04-10  8:13   ` Kevin Wolf

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=1270560614-31030-3-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.