[src/trunk]: src/sys/ufs/lfs Merge -r1.213 of ufs_vnops.c:

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

details:   https://anonhg.NetBSD.org/src/rev/a5c9822267d9
branches:  trunk
changeset: 787257:a5c9822267d9
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sat Jun 08 20:43:35 2013 +0000

description:
Merge -r1.213 of ufs_vnops.c:

Committed By:   kardel
Date:           Sat Jun  8 05:47:02 UTC 2013

fix clearing of system-flags (schg, sappnd). clearing system flags is
possible again at securelevel < 1.
reviewed by christos@

diffstat:

 sys/ufs/lfs/ulfs_vnops.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 63cd781f5bf1 -r a5c9822267d9 sys/ufs/lfs/ulfs_vnops.c
--- a/sys/ufs/lfs/ulfs_vnops.c  Sat Jun 08 19:40:07 2013 +0000
+++ b/sys/ufs/lfs/ulfs_vnops.c  Sat Jun 08 20:43:35 2013 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: ulfs_vnops.c,v 1.9 2013/06/08 02:14:46 dholland Exp $  */
-/*  from NetBSD: ufs_vnops.c,v 1.212 2013/03/18 19:35:48 plunky Exp  */
+/*     $NetBSD: ulfs_vnops.c,v 1.10 2013/06/08 20:43:35 dholland Exp $ */
+/*  from NetBSD: ufs_vnops.c,v 1.213 2013/06/08 05:47:02 kardel Exp  */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.9 2013/06/08 02:14:46 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.10 2013/06/08 20:43:35 dholland Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_lfs.h"
@@ -498,7 +498,7 @@
                        action |= KAUTH_VNODE_HAS_SYSFLAGS;
                }
 
-               if ((vap->va_flags & UF_SETTABLE) != vap->va_flags) {
+               if ((vap->va_flags & SF_SETTABLE) != (ip->i_flags & SF_SETTABLE)) {
                        action |= KAUTH_VNODE_WRITE_SYSFLAGS;
                        changing_sysflags = true;
                }