From patchwork Fri Jun 4 04:38:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: virtio-9p: Return correct error from v9fs_remove Date: Thu, 03 Jun 2010 18:38:55 -0000 From: Sripathi Kodi X-Patchwork-Id: 54538 Message-Id: <20100604100855.126433f1@in.ibm.com> To: qemu-devel@nongnu.org Cc: aneesh.kumar@linux.vnet.ibm.com This patch got mangled last time. Resending. virtio-9p: Return correct error from v9fs_remove In v9fs_remove_post_remove() we currently ignore the error returned by the previous call to remove() and return an error only if freeing the fid fails. However, the client expects to see the error from remove(). Currently the client falsely thinks that the remove call has always succeeded. For example, doing rmdir on a non-empty directory does not return ENOTEMPTY. With this patch we ignore the error from free_fid(). The client cannot use this error value anyway. Signed-off-by: Sripathi Kodi --- hw/virtio-9p.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index e5d0112..999c0d5 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -1943,14 +1943,15 @@ typedef struct V9fsRemoveState { static void v9fs_remove_post_remove(V9fsState *s, V9fsRemoveState *vs, int err) { - /* For TREMOVE we need to clunk the fid even on failed remove */ - err = free_fid(s, vs->fidp->fid); if (err < 0) { - goto out; + err = -errno; + } else { + err = vs->offset; } - err = vs->offset; -out: + /* 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); }