[src/trunk]: src/sys/ufs/ffs Adapt the test "enable WAPBL on rw mounts only" ...

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5702386bef0d
branches:  trunk
changeset: 351937:5702386bef0d
user:      hannken <hannken%NetBSD.org@localhost>
date:      Mon Mar 06 10:12:00 2017 +0000

description:
Adapt the test "enable WAPBL on rw mounts only" to the recent change of
the protocol to update a mounted file.

Should fix PR kern/52031 (FFS mount update doesn't play nice with WAPBL)

diffstat:

 sys/ufs/ffs/ffs_vfsops.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 0fc70f130282 -r 5702386bef0d sys/ufs/ffs/ffs_vfsops.c
--- a/sys/ufs/ffs/ffs_vfsops.c  Mon Mar 06 10:11:21 2017 +0000
+++ b/sys/ufs/ffs/ffs_vfsops.c  Mon Mar 06 10:12:00 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_vfsops.c,v 1.348 2017/03/01 10:46:43 hannken Exp $ */
+/*     $NetBSD: ffs_vfsops.c,v 1.349 2017/03/06 10:12:00 hannken Exp $ */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.348 2017/03/01 10:46:43 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.349 2017/03/06 10:12:00 hannken Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -518,7 +518,8 @@
 
 #ifdef WAPBL
        /* WAPBL can only be enabled on a r/w mount. */
-       if ((mp->mnt_flag & MNT_RDONLY) && !(mp->mnt_iflag & IMNT_WANTRDWR)) {
+       if (((mp->mnt_flag & MNT_RDONLY) && !(mp->mnt_iflag & IMNT_WANTRDWR)) ||
+           (mp->mnt_iflag & IMNT_WANTRDONLY)) {
                mp->mnt_flag &= ~MNT_LOG;
        }
 #else /* !WAPBL */