mirror of https://github.com/xemu-project/xemu.git
virtio-9p: Return correct error from v9fs_remove
Signed-off-by: Sripathi Kodi <sripathik@in.ibm.com> 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 <sripathik@in.ibm.com> Signed-off-by: Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
This commit is contained in:
parent
be940c8716
commit
926487b70b
|
@ -1877,14 +1877,15 @@ static void v9fs_flush(V9fsState *s, V9fsPDU *pdu)
|
|||
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);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue