提交 cb19cff4 编写于 作者: J John Ferlan

virfile: Fix error path for forked virFileRemove

As it turns out the caller in this case expects a return < 0 for failure
and to get/use "errno" rather than using the negative of returned status.
Again different than the create path.

If someone "deleted" a file from the pool without using virsh vol-delete,
then the unlink/rmdir would return an error (-1) and set errno to ENOENT.
The caller checks errno for ENOENT when determining whether to throw an
error message indicating the failure.  Without the change, the error
message is:

error: Failed to delete vol $vol
error: cannot unlink file '/$pathto/$vol': Success

This patch thus allows the fork path to follow the non-fork path
where unlink/rmdir return -1 and errno.
上级 c6b32d68
...@@ -2364,8 +2364,10 @@ virFileRemove(const char *path, ...@@ -2364,8 +2364,10 @@ virFileRemove(const char *path,
status = EACCES; status = EACCES;
} }
if (status) if (status) {
ret = -status; errno = status;
ret = -1;
}
return ret; return ret;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册