Merge pull request #2097 from mikemccracken/2018-01-19/report-storage-destroy

storage: treat return value from ops->destroy as int
This commit is contained in:
Christian Brauner 2018-01-20 06:27:36 +01:00 committed by GitHub
commit 95220ee6e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -603,13 +603,14 @@ bool storage_destroy(struct lxc_conf *conf)
{
struct lxc_storage *r;
bool ret = false;
int destroy_rv = 0;
r = storage_init(conf);
if (!r)
return ret;
ret = r->ops->destroy(r);
if (ret == 0)
destroy_rv = r->ops->destroy(r);
if (destroy_rv == 0)
ret = true;
storage_put(r);