Date: Mon, 6 Feb 2006 22:09:18 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 91271 for review Message-ID: <200602062209.k16M9IFt005087@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=91271 Change 91271 by jhb@jhb_slimer on 2006/02/06 22:08:36 Sync this file with HEAD. Affected files ... .. //depot/projects/smpng/sys/kern/kern_acct.c#39 integrate Differences ... ==== //depot/projects/smpng/sys/kern/kern_acct.c#39 (text+ko) ==== @@ -42,29 +42,29 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.76 2005/11/12 10:45:13 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.78 2006/02/03 16:37:55 jhb Exp $"); #include "opt_mac.h" #include <sys/param.h> #include <sys/systm.h> +#include <sys/acct.h> +#include <sys/fcntl.h> +#include <sys/kernel.h> #include <sys/lock.h> +#include <sys/mac.h> +#include <sys/mount.h> #include <sys/mutex.h> -#include <sys/sysproto.h> +#include <sys/namei.h> #include <sys/proc.h> -#include <sys/mac.h> -#include <sys/mount.h> -#include <sys/vnode.h> -#include <sys/fcntl.h> -#include <sys/syslog.h> -#include <sys/kernel.h> +#include <sys/resourcevar.h> #include <sys/sx.h> +#include <sys/sysctl.h> #include <sys/sysent.h> -#include <sys/sysctl.h> -#include <sys/namei.h> -#include <sys/acct.h> -#include <sys/resourcevar.h> +#include <sys/syslog.h> +#include <sys/sysproto.h> #include <sys/tty.h> +#include <sys/vnode.h> /* * The routines implemented in this file are described in: @@ -143,7 +143,7 @@ * appending and make sure it's a 'normal'. While we could * conditionally acquire Giant here, we're actually interacting with * vnodes from possibly two file systems, making the logic a bit - * complicated. For now, use Giant unconditionally. + * complicated. For now, use Giant unconditionally. */ mtx_lock(&Giant); if (uap->path != NULL) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602062209.k16M9IFt005087>