summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/fs/vfs.c
diff options
context:
space:
mode:
authorJohn Levon <john.levon@joyent.com>2018-12-18 13:17:10 +0000
committerDan McDonald <danmcd@joyent.com>2019-01-17 11:04:05 -0500
commitd6294894f9d15dfb12a0dd3a6acf8bd4a4a65408 (patch)
treead024edb09d9078e6b3feb7b6c1c4b351f66650a /usr/src/uts/common/fs/vfs.c
parent598f111b6a2800d5bd143949a1bdb1e786a92fc3 (diff)
downloadillumos-joyent-d6294894f9d15dfb12a0dd3a6acf8bd4a4a65408.tar.gz
10083 smatch fixes for common/fs/vfs.c
Reviewed by: Marcel Telka <marcel@telka.sk> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/uts/common/fs/vfs.c')
-rw-r--r--usr/src/uts/common/fs/vfs.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/uts/common/fs/vfs.c b/usr/src/uts/common/fs/vfs.c
index 42198e2388..e3884aa232 100644
--- a/usr/src/uts/common/fs/vfs.c
+++ b/usr/src/uts/common/fs/vfs.c
@@ -21,7 +21,7 @@
/*
* Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2016 Joyent, Inc.
+ * Copyright (c) 2019, Joyent, Inc.
* Copyright 2016 Toomas Soome <tsoome@me.com>
* Copyright (c) 2016, 2017 by Delphix. All rights reserved.
* Copyright 2016 Nexenta Systems, Inc.
@@ -1031,7 +1031,7 @@ out:
static void
lofi_remove(struct vfs *vfsp)
{
- struct lofi_ioctl *li = NULL;
+ struct lofi_ioctl *li;
ldi_ident_t ldi_id;
ldi_handle_t ldi_hdl;
int err;
@@ -1061,8 +1061,7 @@ lofi_remove(struct vfs *vfsp)
out:
ldi_ident_release(ldi_id);
- if (li != NULL)
- kmem_free(li, sizeof (*li));
+ kmem_free(li, sizeof (*li));
}
/*
@@ -4232,7 +4231,7 @@ vfsinit(void)
for (vswp = &vfssw[1]; vswp < &vfssw[nfstype]; vswp++) {
RLOCK_VFSSW();
if (vswp->vsw_init != NULL)
- (*vswp->vsw_init)(vswp - vfssw, vswp->vsw_name);
+ (void) (*vswp->vsw_init)(vswp - vfssw, vswp->vsw_name);
RUNLOCK_VFSSW();
}