From owner-svn-src-head@FreeBSD.ORG Sun Jun 7 09:10:14 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 81333122; Sun, 7 Jun 2015 09:10:14 +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 3AFF11DAF; Sun, 7 Jun 2015 09:10:14 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from slw by zxy.spb.ru with local (Exim 4.84 (FreeBSD)) (envelope-from ) id 1Z1Wah-0000Qr-MI; Sun, 07 Jun 2015 12:10:03 +0300 Date: Sun, 7 Jun 2015 12:10:03 +0300 From: Slawa Olhovchenkov To: Mark Johnston Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r284082 - head/sys/fs/unionfs Message-ID: <20150607091003.GD58397@zxy.spb.ru> References: <201506061636.t56GaDK0035920@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201506061636.t56GaDK0035920@svn.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: Sun, 07 Jun 2015 09:10:14 -0000 On Sat, Jun 06, 2015 at 04:36:13PM +0000, Mark Johnston wrote: > Author: markj > Date: Sat Jun 6 16:36:13 2015 > New Revision: 284082 > URL: https://svnweb.freebsd.org/changeset/base/284082 > > Log: > unionfs: fix suspendability check bugs > > - MNTK_SUSPENDABLE is set in mnt_kern_flag, not mnt_flag. > - The lower layer of a unionfs mount is read-only, so the mount should > be suspendable iff the upper layer is suspendable. > - Remove a couple of superfluous comments. Can you look also to bug 175449? > Differential Revision: https://reviews.freebsd.org/D2714 > Reviewed by: kib, mjg > > Modified: > head/sys/fs/unionfs/union_vfsops.c > > Modified: head/sys/fs/unionfs/union_vfsops.c > ============================================================================== > --- head/sys/fs/unionfs/union_vfsops.c Sat Jun 6 16:20:39 2015 (r284081) > +++ head/sys/fs/unionfs/union_vfsops.c Sat Jun 6 16:36:13 2015 (r284082) > @@ -291,18 +291,11 @@ unionfs_domount(struct mount *mp) > } > > MNT_ILOCK(mp); > - /* > - * Check mnt_flag > - */ > if ((ump->um_lowervp->v_mount->mnt_flag & MNT_LOCAL) && > (ump->um_uppervp->v_mount->mnt_flag & MNT_LOCAL)) > mp->mnt_flag |= MNT_LOCAL; > > - /* > - * Check mnt_kern_flag > - */ > - if ((ump->um_lowervp->v_mount->mnt_flag & MNTK_SUSPENDABLE) || > - (ump->um_uppervp->v_mount->mnt_flag & MNTK_SUSPENDABLE)) > + if ((ump->um_uppervp->v_mount->mnt_kern_flag & MNTK_SUSPENDABLE) != 0) > mp->mnt_kern_flag |= MNTK_SUSPENDABLE; > MNT_IUNLOCK(mp); > > _______________________________________________ > 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"