From: Greg Kurz <gkurz@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>,
Greg Kurz <gkurz@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PULL 4/7] 9p: drop useless out: label
Date: Mon, 6 Jun 2016 14:32:42 +0200 [thread overview]
Message-ID: <201606061233.u56CTla1009756@mx0a-001b2d01.pphosted.com> (raw)
In-Reply-To: <1465216365-13078-1-git-send-email-gkurz@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com>
---
hw/9pfs/9p.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index a71d44dc7420..42ac4d79fbe3 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -1642,15 +1642,15 @@ static int v9fs_do_readdir_with_stat(V9fsPDU *pdu,
}
err = v9fs_co_name_to_path(pdu, &fidp->path, dent->d_name, &path);
if (err < 0) {
- goto out;
+ break;
}
err = v9fs_co_lstat(pdu, &path, &stbuf);
if (err < 0) {
- goto out;
+ break;
}
err = stat_to_v9stat(pdu, &path, &stbuf, &v9stat);
if (err < 0) {
- goto out;
+ break;
}
/* 11 = 7 + 4 (7 = start offset, 4 = space for storing count) */
len = pdu_marshal(pdu, 11 + count, "S", &v9stat);
@@ -1667,7 +1667,7 @@ static int v9fs_do_readdir_with_stat(V9fsPDU *pdu,
v9fs_path_free(&path);
saved_dir_pos = dent->d_off;
}
-out:
+
g_free(dent);
v9fs_path_free(&path);
if (err < 0) {
--
2.5.5
next prev parent reply other threads:[~2016-06-06 12:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1465216365-13078-1-git-send-email-gkurz@linux.vnet.ibm.com>
2016-06-06 12:32 ` [Qemu-devel] [PULL 1/7] 9p: some more cleanup in #include directives Greg Kurz
2016-06-06 12:32 ` [Qemu-devel] [PULL 2/7] 9p/fsdev: remove obsolete references to virtio Greg Kurz
2016-06-06 12:32 ` [Qemu-devel] [PULL 3/7] 9p: drop useless inclusion of hw/i386/pc.h Greg Kurz
2016-06-06 12:32 ` Greg Kurz [this message]
2016-06-06 12:32 ` [Qemu-devel] [PULL 5/7] 9p: introduce the V9fsDir type Greg Kurz
2016-06-06 12:32 ` [Qemu-devel] [PULL 6/7] 9p: add locking to V9fsDir Greg Kurz
2016-06-06 12:32 ` [Qemu-devel] [PULL 7/7] 9p: switch back to readdir() Greg Kurz
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=201606061233.u56CTla1009756@mx0a-001b2d01.pphosted.com \
--to=gkurz@linux.vnet.ibm.com \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=peter.maydell@linaro.org \
--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.