6884006 lint noise from smbfs library construction

6 files changed, 37 insertions, 11 deletions

diff --git a/usr/src/uts/Makefile.targ b/usr/src/uts/Makefile.targ
index f05cac59d6..e4e26bbb39 100644
--- a/usr/src/uts/Makefile.targ
+++ b/usr/src/uts/Makefile.targ
@@ -74,12 +74,14 @@ MOD_LINT_LIB	= $(LINT_LIB_DIR)/llib-l$(LINT_MODULE).ln
 
 $(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
diff --git a/usr/src/uts/common/Makefile.rules b/usr/src/uts/common/Makefile.rules
index 06115e976b..04f4e755dd 100644
--- a/usr/src/uts/common/Makefile.rules
+++ b/usr/src/uts/common/Makefile.rules
@@ -1660,14 +1660,8 @@ $(LINTS_DIR)/%.ln:		$(UTSBASE)/common/fs/proc/%.c
 $(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))
diff --git a/usr/src/uts/intel/nsmb/Makefile b/usr/src/uts/intel/nsmb/Makefile
index a55850a141..ad20178ce4 100644
--- a/usr/src/uts/intel/nsmb/Makefile
+++ b/usr/src/uts/intel/nsmb/Makefile
@@ -73,6 +73,11 @@ 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.
 #
diff --git a/usr/src/uts/intel/smbfs/Makefile b/usr/src/uts/intel/smbfs/Makefile
index ed15103d1c..445d40c736 100644
--- a/usr/src/uts/intel/smbfs/Makefile
+++ b/usr/src/uts/intel/smbfs/Makefile
@@ -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 @@ C99MODE		= $(C99_ENABLE)
 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.
 #
diff --git a/usr/src/uts/sparc/nsmb/Makefile b/usr/src/uts/sparc/nsmb/Makefile
index 09b2bc72b9..174d0f77bf 100644
--- a/usr/src/uts/sparc/nsmb/Makefile
+++ b/usr/src/uts/sparc/nsmb/Makefile
@@ -97,6 +97,11 @@ 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.
 #
diff --git a/usr/src/uts/sparc/smbfs/Makefile b/usr/src/uts/sparc/smbfs/Makefile
index fdf1007440..3f75aa8c83 100644
--- a/usr/src/uts/sparc/smbfs/Makefile
+++ b/usr/src/uts/sparc/smbfs/Makefile
@@ -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 @@ C99MODE		= $(C99_ENABLE)
 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.
 #