MFV r262570:
4626 libzfs memleak in zpool_in_use() illumos/illumos-gate@fb13f48f1d MFC after: 2 weeks
This commit is contained in:
commit
9af4c716d0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=262577
@ -20,8 +20,8 @@
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
|
||||
* Copyright (c) 2012 by Delphix. All rights reserved.
|
||||
* Copyright 2014 Nexenta Systems, Inc. All rights reserved.
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -1613,9 +1613,16 @@ zpool_in_use(libzfs_handle_t *hdl, int fd, pool_state_t *state, char **namestr,
|
||||
* its state to active.
|
||||
*/
|
||||
if (pool_active(hdl, name, guid, &isactive) == 0 && isactive &&
|
||||
(zhp = zpool_open_canfail(hdl, name)) != NULL &&
|
||||
zpool_get_prop_int(zhp, ZPOOL_PROP_READONLY, NULL))
|
||||
stateval = POOL_STATE_ACTIVE;
|
||||
(zhp = zpool_open_canfail(hdl, name)) != NULL) {
|
||||
if (zpool_get_prop_int(zhp, ZPOOL_PROP_READONLY, NULL))
|
||||
stateval = POOL_STATE_ACTIVE;
|
||||
|
||||
/*
|
||||
* All we needed the zpool handle for is the
|
||||
* readonly prop check.
|
||||
*/
|
||||
zpool_close(zhp);
|
||||
}
|
||||
|
||||
ret = B_TRUE;
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user