qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kurz <groug@kaod.org>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>,
	Greg Kurz <groug@kaod.org>
Subject: [Qemu-devel] [PULL 06/12] 9pfs: drop useless check in pdu_free()
Date: Mon, 17 Oct 2016 17:05:48 +0200	[thread overview]
Message-ID: <1476716754-26686-7-git-send-email-groug@kaod.org> (raw)
In-Reply-To: <1476716754-26686-1-git-send-email-groug@kaod.org>

Out of the three users of pdu_free(), none ever passes a NULL pointer to
this function.

Signed-off-by: Greg Kurz <groug@kaod.org>
---
 hw/9pfs/9p.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index f2ab1dfab2b2..df8aa726c9a1 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -626,16 +626,14 @@ V9fsPDU *pdu_alloc(V9fsState *s)
 
 void pdu_free(V9fsPDU *pdu)
 {
-    if (pdu) {
-        V9fsState *s = pdu->s;
-        /*
-         * Cancelled pdu are added back to the freelist
-         * by flush request .
-         */
-        if (!pdu->cancelled) {
-            QLIST_REMOVE(pdu, next);
-            QLIST_INSERT_HEAD(&s->free_list, pdu, next);
-        }
+    V9fsState *s = pdu->s;
+    /*
+     * Cancelled pdu are added back to the freelist
+     * by flush request .
+     */
+    if (!pdu->cancelled) {
+        QLIST_REMOVE(pdu, next);
+        QLIST_INSERT_HEAD(&s->free_list, pdu, next);
     }
 }
 
-- 
2.5.5

  parent reply	other threads:[~2016-10-17 15:06 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-17 15:05 [Qemu-devel] [PULL 00/12] 9p patches for 2.8 20161017 Greg Kurz
2016-10-17 15:05 ` [Qemu-devel] [PULL 01/12] 9pfs: allocate space for guest originated empty strings Greg Kurz
2016-10-17 15:05 ` [Qemu-devel] [PULL 02/12] 9pfs: fix potential host memory leak in v9fs_read Greg Kurz
2016-10-17 15:05 ` [Qemu-devel] [PULL 03/12] 9pfs: fsdev: drop useless extern annotation for functions Greg Kurz
2016-10-17 15:05 ` [Qemu-devel] [PULL 04/12] 9pfs: use coroutine_fn annotation in hw/9pfs/co*.[ch] Greg Kurz
2016-10-17 15:05 ` [Qemu-devel] [PULL 05/12] 9pfs: use coroutine_fn annotation in hw/9pfs/9p.[ch] Greg Kurz
2016-10-17 15:05 ` Greg Kurz [this message]
2016-10-17 15:05 ` [Qemu-devel] [PULL 07/12] 9pfs: only free completed request if not flushed Greg Kurz
2016-10-17 15:05 ` [Qemu-devel] [PULL 08/12] virtio-9p: add reset handler Greg Kurz
2016-10-17 15:05 ` [Qemu-devel] [PULL 09/12] 9pfs: fix information leak in xattr read Greg Kurz
2016-10-17 15:05 ` [Qemu-devel] [PULL 10/12] 9pfs: fix memory leak in v9fs_xattrcreate Greg Kurz
2016-10-17 15:05 ` [Qemu-devel] [PULL 11/12] 9pfs: fix memory leak in v9fs_link Greg Kurz
2016-10-17 15:05 ` [Qemu-devel] [PULL 12/12] 9pfs: fix memory leak in v9fs_write Greg Kurz
2016-10-17 16:17 ` [Qemu-devel] [PULL 00/12] 9p patches for 2.8 20161017 Peter Maydell

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=1476716754-26686-7-git-send-email-groug@kaod.org \
    --to=groug@kaod.org \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).