--- a/usr/src/uts/Makefile.targ Thu Sep 24 09:42:31 2009 +0800
+++ b/usr/src/uts/Makefile.targ Wed Sep 23 22:00:34 2009 -0400
@@ -74,12 +74,14 @@
$(MOD_LINT_LIB): $(LINT_LIB_DIR) $(LINTS)
@-$(ECHO) "\n$(OBJS_DIR)/$(MODULE): (library construction):"
- @$(LINT) -o $(LINT_MODULE)-$(OBJS_DIR) $(LINTFLAGS) $(LINTS)
+ @($(LINT) -o $(LINT_MODULE)-$(OBJS_DIR) \
+ $(LINTFLAGS) $(LINTS) $(LTAIL))
@$(MV) llib-l$(LINT_MODULE)-$(OBJS_DIR).ln $@
$(LINT_MODULE).lint: $(MOD_LINT_LIB) $(LINT_LIB) $(GEN_LINT_LIB)
@-$(ECHO) "\n$(OBJS_DIR)/$(LINT_MODULE): global crosschecks:"
- @$(LINT) $(LINTFLAGS) $(MOD_LINT_LIB) $(LINT_LIB) $(GEN_LINT_LIB)
+ @($(LINT) $(LINTFLAGS) $(MOD_LINT_LIB) \
+ $(LINT_LIB) $(GEN_LINT_LIB) $(LTAIL))
#
# Since assym.h is a derived file, the dependency must be explicit for
--- a/usr/src/uts/common/Makefile.rules Thu Sep 24 09:42:31 2009 +0800
+++ b/usr/src/uts/common/Makefile.rules Wed Sep 23 22:00:34 2009 -0400
@@ -1660,14 +1660,8 @@
$(LINTS_DIR)/%.ln: $(UTSBASE)/common/fs/sharefs/%.c
@($(LHEAD) $(LINT.c) $< $(LTAIL))
-NSMBLINT = -erroff=E_FUNC_RET_ALWAYS_IGNOR2 -erroff=E_FUNC_RET_MAYBE_IGNORED2
-
$(LINTS_DIR)/%.ln: $(UTSBASE)/common/fs/smbclnt/netsmb/%.c
- @($(LHEAD) $(LINT.c) $(NSMBLINT) $< $(LTAIL))
-
-$(LINTS_DIR)/smbfs_smb.ln: $(UTSBASE)/common/fs/smbclnt/smbfs/smbfs_smb.c
- @($(LHEAD) $(LINT.c) $(NSMBLINT) \
- $(UTSBASE)/common/fs/smbclnt/smbfs/smbfs_smb.c $(LTAIL))
+ @($(LHEAD) $(LINT.c) $< $(LTAIL))
$(LINTS_DIR)/%.ln: $(UTSBASE)/common/fs/smbclnt/smbfs/%.c
@($(LHEAD) $(LINT.c) $< $(LTAIL))
--- a/usr/src/uts/intel/nsmb/Makefile Thu Sep 24 09:42:31 2009 +0800
+++ b/usr/src/uts/intel/nsmb/Makefile Wed Sep 23 22:00:34 2009 -0400
@@ -73,6 +73,11 @@
# Until CR 4994570 is fixed...
LINTTAGS += -erroff=E_BAD_FORMAT_ARG_TYPE2
+# The mb_put/md_get functions are intentionally used with and without
+# return value checks, so filter those out like LGREP.2 does.
+LGREP.nsmb = egrep -v ' ignored: (mb_put|md_get)'
+LTAIL += 2>&1 | $(LGREP.2) | $(LGREP.nsmb) || true
+
#
# Default build targets.
#
--- a/usr/src/uts/intel/smbfs/Makefile Thu Sep 24 09:42:31 2009 +0800
+++ b/usr/src/uts/intel/smbfs/Makefile Wed Sep 23 22:00:34 2009 -0400
@@ -21,7 +21,7 @@
#
# uts/intel/smbfs/Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# This makefile drives the production of the smbfs (Server
@@ -65,6 +65,16 @@
INC_PATH += -I$(UTSBASE)/common/fs/smbclnt
LDFLAGS += -dy -Ndrv/nsmb
+LINTTAGS += -erroff=E_FUNC_RET_ALWAYS_IGNOR2
+LINTTAGS += -erroff=E_FUNC_RET_MAYBE_IGNORED2
+# Until CR 4994570 is fixed...
+LINTTAGS += -erroff=E_BAD_FORMAT_ARG_TYPE2
+
+# The mb_put/md_get functions are intentionally used with and without
+# return value checks, so filter those out like LGREP.2 does.
+LGREP.nsmb = egrep -v ' ignored: (mb_put|md_get)'
+LTAIL += 2>&1 | $(LGREP.2) | $(LGREP.nsmb) || true
+
#
# Default build targets.
#
--- a/usr/src/uts/sparc/nsmb/Makefile Thu Sep 24 09:42:31 2009 +0800
+++ b/usr/src/uts/sparc/nsmb/Makefile Wed Sep 23 22:00:34 2009 -0400
@@ -97,6 +97,11 @@
# Until CR 4994570 is fixed...
LINTTAGS += -erroff=E_BAD_FORMAT_ARG_TYPE2
+# The mb_put/md_get functions are intentionally used with and without
+# return value checks, so filter those out like LGREP.2 does.
+LGREP.nsmb = egrep -v ' ignored: (mb_put|md_get)'
+LTAIL += 2>&1 | $(LGREP.2) | $(LGREP.nsmb) || true
+
#
# Default build targets.
#
--- a/usr/src/uts/sparc/smbfs/Makefile Thu Sep 24 09:42:31 2009 +0800
+++ b/usr/src/uts/sparc/smbfs/Makefile Wed Sep 23 22:00:34 2009 -0400
@@ -21,7 +21,7 @@
#
# uts/sparc/smbfs/Makefile
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# This makefile drives the production of the smbfs (Server
@@ -65,6 +65,16 @@
INC_PATH += -I$(UTSBASE)/common/fs/smbclnt
LDFLAGS += -dy -Ndrv/nsmb
+LINTTAGS += -erroff=E_FUNC_RET_ALWAYS_IGNOR2
+LINTTAGS += -erroff=E_FUNC_RET_MAYBE_IGNORED2
+# Until CR 4994570 is fixed...
+LINTTAGS += -erroff=E_BAD_FORMAT_ARG_TYPE2
+
+# The mb_put/md_get functions are intentionally used with and without
+# return value checks, so filter those out like LGREP.2 does.
+LGREP.nsmb = egrep -v ' ignored: (mb_put|md_get)'
+LTAIL += 2>&1 | $(LGREP.2) | $(LGREP.nsmb) || true
+
#
# Default build targets.
#