From patchwork Tue May 17 19:43:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [V2,23/25,virtio-9p] Remove post functions for v9fs_remove From: jvrao X-Patchwork-Id: 96031 Message-Id: <1305661431-21289-24-git-send-email-jvrao@linux.vnet.ibm.com> To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, "Venkateswararao Jujjuri \(JV\)" , stefanha@linux.vnet.ibm.com Date: Tue, 17 May 2011 12:43:49 -0700 Signed-off-by: Venkateswararao Jujjuri " --- hw/9pfs/virtio-9p.c | 26 +++++++------------------- 1 files changed, 7 insertions(+), 19 deletions(-) diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index 89fe652..a79ec72 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -2577,22 +2577,6 @@ out: complete_pdu(s, pdu, err); } -static void v9fs_remove_post_remove(V9fsState *s, V9fsRemoveState *vs, - int err) -{ - if (err < 0) { - err = -errno; - } else { - err = vs->offset; - } - - /* For TREMOVE we need to clunk the fid even on failed remove */ - free_fid(s, vs->fidp->fid); - - complete_pdu(s, vs->pdu, err); - qemu_free(vs); -} - static void v9fs_remove(void *opaque) { V9fsPDU *pdu = opaque; @@ -2612,11 +2596,15 @@ static void v9fs_remove(void *opaque) err = -EINVAL; goto out; } - err = v9fs_do_remove(s, &vs->fidp->path); - v9fs_remove_post_remove(s, vs, err); - return; + if (err < 0) { + err = -errno; + } else { + err = vs->offset; + } + /* For TREMOVE we need to clunk the fid even on failed remove */ + free_fid(s, vs->fidp->fid); out: complete_pdu(s, pdu, err); qemu_free(vs);