svn commit: r284082 - head/sys/fs/unionfs

[Mark Johnston]

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.
  
  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);