Module Name: src
Committed By: dholland
Date: Sun Jun 19 22:03:06 UTC 2016
Modified Files:
src/sys/ufs/lfs: ulfs_vnops.c
Log Message:
Merge -r1.215 of ufs_vnops.c: the speed limit is 80
(-r1.214 was ffs-only)
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/ufs/lfs/ulfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/lfs/ulfs_vnops.c
diff -u src/sys/ufs/lfs/ulfs_vnops.c:1.35 src/sys/ufs/lfs/ulfs_vnops.c:1.36
--- src/sys/ufs/lfs/ulfs_vnops.c:1.35 Sat Nov 14 22:03:54 2015
+++ src/sys/ufs/lfs/ulfs_vnops.c Sun Jun 19 22:03:06 2016
@@ -1,5 +1,5 @@
-/* $NetBSD: ulfs_vnops.c,v 1.35 2015/11/14 22:03:54 pgoyette Exp $ */
-/* from NetBSD: ufs_vnops.c,v 1.213 2013/06/08 05:47:02 kardel Exp */
+/* $NetBSD: ulfs_vnops.c,v 1.36 2016/06/19 22:03:06 dholland Exp $ */
+/* from NetBSD: NetBSD: ufs_vnops.c,v 1.215 2013/06/09 18:54:05 christos 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.35 2015/11/14 22:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.36 2016/06/19 22:03:06 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -282,7 +282,8 @@ ulfs_setattr(void *v)
action |= KAUTH_VNODE_HAS_SYSFLAGS;
}
- if ((vap->va_flags & SF_SETTABLE) != (ip->i_flags & SF_SETTABLE)) {
+ if ((vap->va_flags & SF_SETTABLE) !=
+ (ip->i_flags & SF_SETTABLE)) {
action |= KAUTH_VNODE_WRITE_SYSFLAGS;
changing_sysflags = true;
}
