diff options
| author | John Levon <john.levon@joyent.com> | 2019-08-27 21:56:50 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2019-08-28 08:58:06 +0000 |
| commit | fa1252de73f343f36bf1e6f366902ba96c480aaa (patch) | |
| tree | c5e3ad394bfba6fc3f094c050ca250897ce56a4b /usr/src/uts/common/fs/dev/sdev_plugin.c | |
| parent | df3850281ea4def494e12172cae5a6181823c77d (diff) | |
| download | illumos-joyent-fa1252de73f343f36bf1e6f366902ba96c480aaa.tar.gz | |
OS-7960 need fixes for NULL as a pointer
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Ryan Zezeski <rpz@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/uts/common/fs/dev/sdev_plugin.c')
| -rw-r--r-- | usr/src/uts/common/fs/dev/sdev_plugin.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr/src/uts/common/fs/dev/sdev_plugin.c b/usr/src/uts/common/fs/dev/sdev_plugin.c index 621eb3287f..8f825eccff 100644 --- a/usr/src/uts/common/fs/dev/sdev_plugin.c +++ b/usr/src/uts/common/fs/dev/sdev_plugin.c @@ -566,23 +566,23 @@ sdev_plugin_register(const char *name, sdev_plugin_ops_t *ops, int *errp) if (sdev_plugin_name_isvalid(name, SDEV_PLUGIN_NAMELEN) == 0) { *errp = EINVAL; - return (NULL); + return ((sdev_plugin_hdl_t)NULL); } if (ops->spo_version != 1) { *errp = EINVAL; - return (NULL); + return ((sdev_plugin_hdl_t)NULL); } if (ops->spo_validate == NULL || ops->spo_filldir == NULL || ops->spo_inactive == NULL) { *errp = EINVAL; - return (NULL); + return ((sdev_plugin_hdl_t)NULL); } if ((ops->spo_flags & ~SDEV_PLUGIN_FLAGS_MASK) != 0) { *errp = EINVAL; - return (NULL); + return ((sdev_plugin_hdl_t)NULL); } spp = kmem_cache_alloc(sdev_plugin_cache, KM_SLEEP); @@ -619,7 +619,7 @@ sdev_plugin_register(const char *name, sdev_plugin_ops_t *ops, int *errp) if (ret != 0) { *errp = ret; kmem_cache_free(sdev_plugin_cache, spp); - return (NULL); + return ((sdev_plugin_hdl_t)NULL); } /* Make sure we have the real vnode */ if (VOP_REALVP(vp, &nvp, NULL) == 0) { @@ -638,7 +638,7 @@ sdev_plugin_register(const char *name, sdev_plugin_ops_t *ops, int *errp) VN_RELE(vp); *errp = EEXIST; kmem_cache_free(sdev_plugin_cache, spp); - return (NULL); + return ((sdev_plugin_hdl_t)NULL); } mutex_enter(&sdev_plugin_lock); @@ -650,7 +650,7 @@ sdev_plugin_register(const char *name, sdev_plugin_ops_t *ops, int *errp) VN_RELE(vp); *errp = EEXIST; kmem_cache_free(sdev_plugin_cache, spp); - return (NULL); + return ((sdev_plugin_hdl_t)NULL); } } |