diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2013-08-15 23:50:47 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2013-08-15 23:50:47 +0000 |
| commit | 83ac000050654ae0ea9fd5b39773c29d316ca740 (patch) | |
| tree | 8abe463c5a360663ab4bf85436f7b311a1f7e6b5 /usr/src | |
| parent | b4f82251ff85152d232c89d5cb42459e9fae2ac8 (diff) | |
| parent | cf7e209d5f01e9f5fe052b444899ba9cba0e9877 (diff) | |
| download | illumos-joyent-83ac000050654ae0ea9fd5b39773c29d316ca740.tar.gz | |
[illumos-gate merge]
commit cf7e209d5f01e9f5fe052b444899ba9cba0e9877
4024 uninitialized and unused variables in cmd/fs.d/nfs
commit 9e5aa9d8a21f8efa8ba9c9e4a0aa6edc66d07eb2
3978 renaming dynamic sdev nodes is problematic
3979 sdev dynamic directories can be created multiple times
3980 sdev vfs refcount assertion violation
3981 sdev backing store nodes not always present
3982 sdev could use some theory statements
3983 sdev_shadow_node slept through a vn_rele
commit dd9c3b29f8e9f6b99b80e1fd8fc03241abd67311
3977 zones can commit suicide by zvol
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/fs.d/nfs/lib/smfcfg.c | 8 | ||||
| -rw-r--r-- | usr/src/cmd/fs.d/nfs/mountd/mountd.c | 4 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/dev/sdev_subr.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/usr/src/cmd/fs.d/nfs/lib/smfcfg.c b/usr/src/cmd/fs.d/nfs/lib/smfcfg.c index ced841d945..cdf2671208 100644 --- a/usr/src/cmd/fs.d/nfs/lib/smfcfg.c +++ b/usr/src/cmd/fs.d/nfs/lib/smfcfg.c @@ -105,12 +105,12 @@ int fs_smf_set_prop(smf_fstype_t fstype, char *prop_name, char *valbuf, char *instance, scf_type_t sctype, char *fmri) { - fs_smfhandle_t *phandle; + fs_smfhandle_t *phandle = NULL; scf_handle_t *handle; scf_propertygroup_t *pg; scf_property_t *prop; - scf_transaction_t *tran; - scf_transaction_entry_t *entry; + scf_transaction_t *tran = NULL; + scf_transaction_entry_t *entry = NULL; scf_instance_t *inst; scf_value_t *val; int valint; @@ -239,7 +239,7 @@ int fs_smf_get_prop(smf_fstype_t fstype, char *prop_name, char *cbuf, char *instance, scf_type_t sctype, char *fmri, int *bufsz) { - fs_smfhandle_t *phandle; + fs_smfhandle_t *phandle = NULL; scf_handle_t *handle; scf_propertygroup_t *pg; scf_property_t *prop; diff --git a/usr/src/cmd/fs.d/nfs/mountd/mountd.c b/usr/src/cmd/fs.d/nfs/mountd/mountd.c index 04f8ff1def..241ed293f8 100644 --- a/usr/src/cmd/fs.d/nfs/mountd/mountd.c +++ b/usr/src/cmd/fs.d/nfs/mountd/mountd.c @@ -2028,7 +2028,7 @@ getclientsflavors_new(share_t *sh, SVCXPRT *transp, struct netbuf **nb, char *lasts; char *f; boolean_t access_ok; - int count, c, perm; + int count, c; boolean_t reject = B_FALSE; opts = strdup(sh->sh_opts); @@ -2038,7 +2038,7 @@ getclientsflavors_new(share_t *sh, SVCXPRT *transp, struct netbuf **nb, } p = opts; - perm = count = c = 0; + count = c = 0; /* default access is rw */ access_ok = B_TRUE; diff --git a/usr/src/uts/common/fs/dev/sdev_subr.c b/usr/src/uts/common/fs/dev/sdev_subr.c index a197cd01ed..b4b27e6285 100644 --- a/usr/src/uts/common/fs/dev/sdev_subr.c +++ b/usr/src/uts/common/fs/dev/sdev_subr.c @@ -1022,7 +1022,7 @@ sdev_direnter(struct sdev_node *ddv, struct sdev_node *dv) static void decr_link(struct sdev_node *dv) { - ASSERT(RW_WRITE_HELD(&dv->sdev_contents)); + VERIFY(RW_WRITE_HELD(&dv->sdev_contents)); if (dv->sdev_state != SDEV_INIT) { VERIFY(dv->sdev_nlink >= 1); dv->sdev_nlink--; |