summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr/src/cmd/zoneadmd/mcap.c4
-rw-r--r--usr/src/lib/brand/lx/lx_support/lx_support.c2
-rw-r--r--usr/src/uts/common/fs/vnode.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/cmd/zoneadmd/mcap.c b/usr/src/cmd/zoneadmd/mcap.c
index be094e4419..88b72b6c55 100644
--- a/usr/src/cmd/zoneadmd/mcap.c
+++ b/usr/src/cmd/zoneadmd/mcap.c
@@ -20,7 +20,7 @@
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
- * Copyright 2016 Joyent, Inc.
+ * Copyright 2017 Joyent, Inc.
*/
/*
@@ -388,7 +388,7 @@ pageout_mapping(pid_t pid, prmap_t *pmp)
if (syscall(SYS_rusagesys, _RUSAGESYS_INVALMAP, pid, base,
chunk) != 0) {
debug("pid %ld: mapping 0x%p %ldkb unpageable (%d)\n",
- pid, base, chunk / 1024, errno);
+ pid, (void *)base, (long)chunk / 1024L, errno);
return;
}
diff --git a/usr/src/lib/brand/lx/lx_support/lx_support.c b/usr/src/lib/brand/lx/lx_support/lx_support.c
index ef4e614e99..d35c68ed8d 100644
--- a/usr/src/lib/brand/lx/lx_support/lx_support.c
+++ b/usr/src/lib/brand/lx/lx_support/lx_support.c
@@ -226,7 +226,7 @@ lxs_set_ttygid(zoneid_t zoneid)
sizeof (tty_gid));
done:
- fclose(fp);
+ (void) fclose(fp);
}
static int
diff --git a/usr/src/uts/common/fs/vnode.c b/usr/src/uts/common/fs/vnode.c
index 12a2a0e0db..305387a283 100644
--- a/usr/src/uts/common/fs/vnode.c
+++ b/usr/src/uts/common/fs/vnode.c
@@ -21,7 +21,7 @@
/*
* Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2016, Joyent, Inc.
+ * Copyright 2017 Joyent, Inc.
* Copyright 2016 Nexenta Systems, Inc. All rights reserved.
*/
@@ -3072,7 +3072,7 @@ retrybuf:
* The only feasible case here is where a NUL lookup is being
* performed on rootdir prior to its v_path being populated.
*/
- ASSERT(pvp->v_path_stamp = 0);
+ ASSERT(pvp->v_path_stamp == 0);
baselen = 0;
pstamp = 0;
} else {