From owner-svn-src-head@freebsd.org Mon Aug 3 09:47:39 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 734C59B1A26; Mon, 3 Aug 2015 09:47:39 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 315081979; Mon, 3 Aug 2015 09:47:39 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from slw by zxy.spb.ru with local (Exim 4.84 (FreeBSD)) (envelope-from ) id 1ZMCLC-0002tQ-7S; Mon, 03 Aug 2015 12:47:30 +0300 Date: Mon, 3 Aug 2015 12:47:30 +0300 From: Slawa Olhovchenkov To: Steven Hartland Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r286223 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <20150803094730.GA24698@zxy.spb.ru> References: <201508030934.t739YAkT026668@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201508030934.t739YAkT026668@repo.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Aug 2015 09:47:39 -0000 On Mon, Aug 03, 2015 at 09:34:10AM +0000, Steven Hartland wrote: > Author: smh > Date: Mon Aug 3 09:34:09 2015 > New Revision: 286223 > URL: https://svnweb.freebsd.org/changeset/base/286223 > > Log: > Fix KSTACK_PAGES check in ZFS module > > The check introduced by r285946 failed to add the dependency on > opt_kstack_pages.h which meant the default value for the platform instead > of the customised options KSTACK_PAGES=X was being tested. > > Also wrap in #ifdef __FreeBSD__ for portability. /usr/src/sys/kern/kern_proc.c:int kstack_pages = KSTACK_PAGES; May be check variable kstack_pages is best way? Eliminate dependency on foreign opt_XXXX. > MFC after: 3 days > Sponsored by: Multiplay > > Modified: > head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c > > Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c > ============================================================================== > --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Mon Aug 3 08:04:31 2015 (r286222) > +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Mon Aug 3 09:34:09 2015 (r286223) > @@ -132,6 +132,9 @@ > * distinguish between the operation failing, and > * deserialization failing. > */ > +#ifdef __FreeBSD__ > +#include "opt_kstack_pages.h" > +#endif > > #include > #include > @@ -6491,18 +6494,22 @@ static void zfs_shutdown(void *, int); > > static eventhandler_tag zfs_shutdown_event_tag; > > +#ifdef __FreeBSD__ > #define ZFS_MIN_KSTACK_PAGES 4 > +#endif > > int > zfs__init(void) > { > > +#ifdef __FreeBSD__ > #if KSTACK_PAGES < ZFS_MIN_KSTACK_PAGES > printf("ZFS NOTICE: KSTACK_PAGES is %d which could result in stack " > "overflow panic!\nPlease consider adding " > "'options KSTACK_PAGES=%d' to your kernel config\n", KSTACK_PAGES, > ZFS_MIN_KSTACK_PAGES); > #endif > +#endif > zfs_root_token = root_mount_hold("ZFS"); > > mutex_init(&zfs_share_lock, NULL, MUTEX_DEFAULT, NULL); > _______________________________________________ > svn-src-all@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"