summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/Makefile.lint1
-rw-r--r--usr/src/cmd/dlmgmtd/dlmgmt_door.c10
-rw-r--r--usr/src/cmd/ssh/ssh-keygen/ssh-keygen.c1
-rw-r--r--usr/src/cmd/svc/svccfg/svccfg_libscf.c5
-rw-r--r--usr/src/cmd/zoneadm/zoneadm.c1
-rw-r--r--usr/src/cmd/zoneadmd/vplat.c22
-rw-r--r--usr/src/common/dis/i386/dis_tables.c6
-rw-r--r--usr/src/lib/libdladm/common/libdlmgmt.c1
-rw-r--r--usr/src/uts/common/fs/zfs/arc.c2
-rw-r--r--usr/src/uts/common/fs/zfs/dmu_tx.c2
-rw-r--r--usr/src/uts/common/fs/zfs/sys/zfs_zone.h2
-rw-r--r--usr/src/uts/common/fs/zfs/zfs_zone.c4
-rw-r--r--usr/src/uts/common/os/clock_highres.c2
-rw-r--r--usr/src/uts/intel/dtrace/dtrace_asm.s1
-rw-r--r--usr/src/uts/intel/ia32/os/archdep.c31
15 files changed, 48 insertions, 43 deletions
diff --git a/usr/src/Makefile.lint b/usr/src/Makefile.lint
index 879ce1d1f5..6fb1be7899 100644
--- a/usr/src/Makefile.lint
+++ b/usr/src/Makefile.lint
@@ -459,7 +459,6 @@ COMMON_SUBDIRS = \
lib/pam_modules \
lib/passwdutil \
lib/pkcs11 \
- lib/print \
lib/raidcfg_plugins \
lib/scsi \
lib/smbsrv \
diff --git a/usr/src/cmd/dlmgmtd/dlmgmt_door.c b/usr/src/cmd/dlmgmtd/dlmgmt_door.c
index acb44870a8..29d265cfdb 100644
--- a/usr/src/cmd/dlmgmtd/dlmgmt_door.c
+++ b/usr/src/cmd/dlmgmtd/dlmgmt_door.c
@@ -62,6 +62,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+#include <unistd.h>
#include "dlmgmt_impl.h"
typedef void dlmgmt_door_handler_t(void *, void *, size_t *, zoneid_t,
@@ -1349,11 +1350,10 @@ dlmgmt_zonehalt(void *argp, void *retp, size_t *sz, zoneid_t zoneid,
*/
int fd;
- while ((fd = open(ZONE_LOCK,
- O_WRONLY | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR))
- < 0)
- sleep(1);
- close(fd);
+ while ((fd = open(ZONE_LOCK, O_WRONLY |
+ O_CREAT | O_EXCL, S_IRUSR | S_IWUSR)) < 0)
+ (void) sleep(1);
+ (void) close(fd);
dlmgmt_table_lock(B_TRUE);
dlmgmt_db_fini(zonehalt->ld_zoneid);
diff --git a/usr/src/cmd/ssh/ssh-keygen/ssh-keygen.c b/usr/src/cmd/ssh/ssh-keygen/ssh-keygen.c
index e4b7d1e5eb..c79e76ae36 100644
--- a/usr/src/cmd/ssh/ssh-keygen/ssh-keygen.c
+++ b/usr/src/cmd/ssh/ssh-keygen/ssh-keygen.c
@@ -1170,6 +1170,7 @@ main(int argc, char **argv)
break;
}
fatal("Unsupported conversion format \"%s\"", optarg);
+ /*NOTREACHED*/
case 'p':
change_passphrase = 1;
break;
diff --git a/usr/src/cmd/svc/svccfg/svccfg_libscf.c b/usr/src/cmd/svc/svccfg/svccfg_libscf.c
index 99cce6ad1f..f8f5e0cd94 100644
--- a/usr/src/cmd/svc/svccfg/svccfg_libscf.c
+++ b/usr/src/cmd/svc/svccfg/svccfg_libscf.c
@@ -6822,13 +6822,16 @@ lscf_instance_verify(scf_scope_t *scope, entity_t *svc, entity_t *inst)
switch (ret) {
case SCF_ERROR_DELETED:
err = ENODEV;
+ break;
case SCF_ERROR_CONNECTION_BROKEN:
warn(gettext("Lost repository connection\n"));
err = ECONNABORTED;
+ break;
case SCF_ERROR_NOT_FOUND:
warn(gettext("Instance \"%s\" disappeared out from "
"under us.\n"), inst->sc_name);
err = ENOENT;
+ break;
default:
bad_error("scf_service_get_instance", ret);
}
@@ -6851,9 +6854,11 @@ lscf_instance_verify(scf_scope_t *scope, entity_t *svc, entity_t *inst)
switch (ret) {
case SCF_ERROR_DELETED:
err = ENODEV;
+ break;
case SCF_ERROR_CONNECTION_BROKEN:
warn(gettext("Lost repository connection\n"));
err = ECONNABORTED;
+ break;
default:
bad_error("scf_service_get_instance", ret);
}
diff --git a/usr/src/cmd/zoneadm/zoneadm.c b/usr/src/cmd/zoneadm/zoneadm.c
index d0b8c7a03f..556b0dd148 100644
--- a/usr/src/cmd/zoneadm/zoneadm.c
+++ b/usr/src/cmd/zoneadm/zoneadm.c
@@ -2535,7 +2535,6 @@ verify_handle(int cmd_num, zone_dochandle_t handle, char *argv[])
dladm_handle_t dh;
dladm_status_t status;
datalink_id_t linkid;
- char errmsg[DLADM_STRSIZE];
in_alt_root = zonecfg_in_alt_root();
if (in_alt_root)
diff --git a/usr/src/cmd/zoneadmd/vplat.c b/usr/src/cmd/zoneadmd/vplat.c
index d2b8c79964..ccb2d867b4 100644
--- a/usr/src/cmd/zoneadmd/vplat.c
+++ b/usr/src/cmd/zoneadmd/vplat.c
@@ -3134,28 +3134,6 @@ remove_datalink_protect(zlog_t *zlogp, zoneid_t zoneid)
}
static int
-unconfigure_exclusive_network_interfaces(zlog_t *zlogp, zoneid_t zoneid)
-{
- int dlnum = 0;
-
- /*
- * The kernel shutdown callback for the dls module should have removed
- * all datalinks from this zone. If any remain, then there's a
- * problem.
- */
- if (zone_list_datalink(zoneid, &dlnum, NULL) != 0) {
- zerror(zlogp, B_TRUE, "unable to list network interfaces");
- return (-1);
- }
- if (dlnum != 0) {
- zerror(zlogp, B_FALSE,
- "datalinks remain in zone after shutdown");
- return (-1);
- }
- return (0);
-}
-
-static int
tcp_abort_conn(zlog_t *zlogp, zoneid_t zoneid,
const struct sockaddr_storage *local, const struct sockaddr_storage *remote)
{
diff --git a/usr/src/common/dis/i386/dis_tables.c b/usr/src/common/dis/i386/dis_tables.c
index 5b3286c63e..62747134d7 100644
--- a/usr/src/common/dis/i386/dis_tables.c
+++ b/usr/src/common/dis/i386/dis_tables.c
@@ -3520,6 +3520,7 @@ just_mem:
case VMx:
if (mode == 3) {
+#ifdef DIS_TEXT
char *vminstr;
switch (r_m) {
@@ -3539,9 +3540,12 @@ just_mem:
goto error;
}
-#ifdef DIS_TEXT
(void) strncpy(x->d86_mnem, vminstr, OPLEN);
+#else
+ if (r_m < 1 || r_m > 4)
+ goto error;
#endif
+
NOMEM;
break;
}
diff --git a/usr/src/lib/libdladm/common/libdlmgmt.c b/usr/src/lib/libdladm/common/libdlmgmt.c
index abb956f94c..c9c7906934 100644
--- a/usr/src/lib/libdladm/common/libdlmgmt.c
+++ b/usr/src/lib/libdladm/common/libdlmgmt.c
@@ -552,7 +552,6 @@ dladm_zname2info(dladm_handle_t handle, const char *zonename, const char *link,
datalink_id_t linkid;
dladm_status_t status;
size_t sz = sizeof (retval);
- zoneid_t curr_zoneid;
getlinkid.ld_cmd = DLMGMT_CMD_GETLINKID;
(void) strlcpy(getlinkid.ld_link, link, MAXLINKNAMELEN);
diff --git a/usr/src/uts/common/fs/zfs/arc.c b/usr/src/uts/common/fs/zfs/arc.c
index 78299b85a0..f563c67516 100644
--- a/usr/src/uts/common/fs/zfs/arc.c
+++ b/usr/src/uts/common/fs/zfs/arc.c
@@ -2922,7 +2922,7 @@ top:
* should delay this I/O if this zone is using more than its I/O
* priority allows.
*/
- zfs_zone_io_throttle(ZFS_ZONE_IOP_READ, size);
+ zfs_zone_io_throttle(ZFS_ZONE_IOP_READ);
if (*arc_flags & ARC_WAIT)
return (zio_wait(rzio));
diff --git a/usr/src/uts/common/fs/zfs/dmu_tx.c b/usr/src/uts/common/fs/zfs/dmu_tx.c
index 75aa3cb9cb..3492fd5b12 100644
--- a/usr/src/uts/common/fs/zfs/dmu_tx.c
+++ b/usr/src/uts/common/fs/zfs/dmu_tx.c
@@ -220,7 +220,7 @@ dmu_tx_count_write(dmu_tx_hold_t *txh, uint64_t off, uint64_t len)
if (len == 0)
return;
- zfs_zone_io_throttle(ZFS_ZONE_IOP_LOGICAL_WRITE, len);
+ zfs_zone_io_throttle(ZFS_ZONE_IOP_LOGICAL_WRITE);
min_bs = SPA_MINBLOCKSHIFT;
max_bs = SPA_MAXBLOCKSHIFT;
diff --git a/usr/src/uts/common/fs/zfs/sys/zfs_zone.h b/usr/src/uts/common/fs/zfs/sys/zfs_zone.h
index 5e84fba949..069ec004f3 100644
--- a/usr/src/uts/common/fs/zfs/sys/zfs_zone.h
+++ b/usr/src/uts/common/fs/zfs/sys/zfs_zone.h
@@ -42,7 +42,7 @@ typedef enum {
ZFS_ZONE_IOP_LOGICAL_WRITE,
} zfs_zone_iop_type_t;
-extern void zfs_zone_io_throttle(zfs_zone_iop_type_t, uint64_t);
+extern void zfs_zone_io_throttle(zfs_zone_iop_type_t);
extern void zfs_zone_zio_init(zio_t *);
extern void zfs_zone_zio_start(zio_t *);
diff --git a/usr/src/uts/common/fs/zfs/zfs_zone.c b/usr/src/uts/common/fs/zfs/zfs_zone.c
index 8f90e8158b..08f4f38e04 100644
--- a/usr/src/uts/common/fs/zfs/zfs_zone.c
+++ b/usr/src/uts/common/fs/zfs/zfs_zone.c
@@ -33,7 +33,7 @@
*/
void
-zfs_zone_io_throttle(zfs_zone_iop_type_t type, uint64_t size)
+zfs_zone_io_throttle(zfs_zone_iop_type_t type)
{
}
@@ -872,7 +872,7 @@ zfs_zone_zio_init(zio_t *zp)
* retrieve the data to be read through dmu_read_uio.
*/
void
-zfs_zone_io_throttle(zfs_zone_iop_type_t type, uint64_t size)
+zfs_zone_io_throttle(zfs_zone_iop_type_t type)
{
zone_t *zonep = curzone;
hrtime_t unow;
diff --git a/usr/src/uts/common/os/clock_highres.c b/usr/src/uts/common/os/clock_highres.c
index 03dd1b4371..b93ba697d9 100644
--- a/usr/src/uts/common/os/clock_highres.c
+++ b/usr/src/uts/common/os/clock_highres.c
@@ -129,7 +129,7 @@ clock_highres_timer_settime(itimer_t *it, int flags,
cyctime.cyt_when += gethrtime();
hrt2ts(cyctime.cyt_when, &it->it_itime.it_value);
- cyclic_reprogram(cyc, cyctime.cyt_when);
+ (void) cyclic_reprogram(cyc, cyctime.cyt_when);
return (0);
}
diff --git a/usr/src/uts/intel/dtrace/dtrace_asm.s b/usr/src/uts/intel/dtrace/dtrace_asm.s
index 754343925c..febd31fb7f 100644
--- a/usr/src/uts/intel/dtrace/dtrace_asm.s
+++ b/usr/src/uts/intel/dtrace/dtrace_asm.s
@@ -62,6 +62,7 @@ dtrace_getfp(void)
#if defined(lint) || defined(__lint)
+/*ARGSUSED*/
uint64_t
dtrace_getvmreg(uint32_t reg, volatile uint16_t *flags)
{ return (0); }
diff --git a/usr/src/uts/intel/ia32/os/archdep.c b/usr/src/uts/intel/ia32/os/archdep.c
index 7603ccb97d..423b94a13e 100644
--- a/usr/src/uts/intel/ia32/os/archdep.c
+++ b/usr/src/uts/intel/ia32/os/archdep.c
@@ -962,9 +962,24 @@ bind_hwcap(void)
auxv_hwcap |= AV_386_AHF;
#endif
- if (auxv_hwcap_include || auxv_hwcap_exclude)
- cmn_err(CE_CONT, "?user ABI extensions: %b\n",
- auxv_hwcap, FMT_AV_386);
+ if (auxv_hwcap_include || auxv_hwcap_exclude) {
+ /*
+ * The below assignment is regrettably required to get lint
+ * to accept the validity of our format string. The format
+ * string is in fact valid, but whatever intelligence in lint
+ * understands the cmn_err()-specific %b appears to have an
+ * off-by-one error: it (mistakenly) complains about bit
+ * number 32 (even though this is explicitly permitted).
+ * Normally, one would will away such warnings with a "LINTED"
+ * directive, but for reasons unclear and unknown, lint
+ * refuses to be assuaged in this case. Fortunately, lint
+ * doesn't pretend to have solved the Halting Problem --
+ * and as soon as the format string is programmatic, it
+ * knows enough to shut up.
+ */
+ const char *fmt = "?user ABI extensions: %b\n";
+ cmn_err(CE_CONT, fmt, auxv_hwcap, FMT_AV_386);
+ }
#if defined(_SYSCALL32_IMPL)
auxv_hwcap32 = (auxv_hwcap32_include | cpu_hwcap_flags) &
@@ -986,9 +1001,13 @@ bind_hwcap(void)
auxv_hwcap32 |= AV_386_AHF;
#endif
- if (auxv_hwcap32_include || auxv_hwcap32_exclude)
- cmn_err(CE_CONT, "?32-bit user ABI extensions: %b\n",
- auxv_hwcap32, FMT_AV_386);
+ if (auxv_hwcap32_include || auxv_hwcap32_exclude) {
+ /*
+ * See the block comment in the cmn_err() of auxv_hwcap, above.
+ */
+ const char *fmt = "?32-bit user ABI extensions: %b\n";
+ cmn_err(CE_CONT, fmt, auxv_hwcap32, FMT_AV_386);
+ }
#endif
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-29 21:00:59 +0000