From owner-svn-src-stable@FreeBSD.ORG  Sun Nov 21 12:40:16 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E4E3C1065670;
	Sun, 21 Nov 2010 12:40:16 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D35EA8FC08;
	Sun, 21 Nov 2010 12:40:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oALCeGdK056703;
	Sun, 21 Nov 2010 12:40:16 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oALCeGNW056701;
	Sun, 21 Nov 2010 12:40:16 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201011211240.oALCeGNW056701@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Sun, 21 Nov 2010 12:40:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215628 - stable/8/sys/kern
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Nov 2010 12:40:17 -0000

Author: delphij
Date: Sun Nov 21 12:40:16 2010
New Revision: 215628
URL: http://svn.freebsd.org/changeset/base/215628

Log:
  MFC r214125:
  
  In syscall_module_handler(): all switch branches return, remove
  unreached code as pointed out in a Chinese forum [1].
  
  [1] http://www.freebsdchina.org/forum/viewtopic.php?t=50619
  
  Pointed out by:		btw616 <btw s qq com>
  
  MFC r214181:
  
  Call chainevh callback when we are invoked with neither MOD_LOAD nor
  MOD_UNLOAD.  This makes it possible to add custom hooks for other module
  events.
  
  Return EOPNOTSUPP when there is no callback available.
  
  Pointed out by:	jhb
  Reviewed by:	jhb

Modified:
  stable/8/sys/kern/kern_syscalls.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/kern/kern_syscalls.c
==============================================================================
--- stable/8/sys/kern/kern_syscalls.c	Sun Nov 21 12:33:11 2010	(r215627)
+++ stable/8/sys/kern/kern_syscalls.c	Sun Nov 21 12:40:16 2010	(r215628)
@@ -127,13 +127,12 @@ syscall_module_handler(struct module *mo
 		error = syscall_deregister(data->offset, &data->old_sysent);
 		return (error);
 	default:
-		return EOPNOTSUPP;
+		if (data->chainevh)
+			return (data->chainevh(mod, what, data->chainarg));
+		return (EOPNOTSUPP);
 	}
 
-	if (data->chainevh)
-		return (data->chainevh(mod, what, data->chainarg));
-	else
-		return (0);
+	/* NOTREACHED */
 }
 
 int