| zfs_context.h (248084) | zfs_context.h (258632) |
|---|---|
| 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 10 unchanged lines hidden (view full) --- 19 * CDDL HEADER END 20 */ 21/* 22 * Copyright 2009 Sun Microsystems, Inc. All rights reserved. 23 * Use is subject to license terms. 24 */ 25/* 26 * Copyright 2011 Nexenta Systems, Inc. All rights reserved. | 1/* 2 * CDDL HEADER START 3 * 4 * The contents of this file are subject to the terms of the 5 * Common Development and Distribution License (the "License"). 6 * You may not use this file except in compliance with the License. 7 * 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE --- 10 unchanged lines hidden (view full) --- 19 * CDDL HEADER END 20 */ 21/* 22 * Copyright 2009 Sun Microsystems, Inc. All rights reserved. 23 * Use is subject to license terms. 24 */ 25/* 26 * Copyright 2011 Nexenta Systems, Inc. All rights reserved. |
| 27 * Copyright (c) 2012 by Delphix. All rights reserved. | 27 * Copyright (c) 2013 by Delphix. All rights reserved. |
| 28 */ 29 30#ifndef _SYS_ZFS_CONTEXT_H 31#define _SYS_ZFS_CONTEXT_H 32 33#ifdef __cplusplus 34extern "C" { 35#endif --- 53 unchanged lines hidden (view full) --- 89#include <sys/osd.h> 90#include <sys/sysevent/dev.h> 91#include <sys/sysevent/eventdefs.h> 92#include <sys/u8_textprep.h> 93#include <sys/fm/util.h> 94#include <sys/sunddi.h> 95#ifdef illumos 96#include <sys/cyclic.h> | 28 */ 29 30#ifndef _SYS_ZFS_CONTEXT_H 31#define _SYS_ZFS_CONTEXT_H 32 33#ifdef __cplusplus 34extern "C" { 35#endif --- 53 unchanged lines hidden (view full) --- 89#include <sys/osd.h> 90#include <sys/sysevent/dev.h> 91#include <sys/sysevent/eventdefs.h> 92#include <sys/u8_textprep.h> 93#include <sys/fm/util.h> 94#include <sys/sunddi.h> 95#ifdef illumos 96#include <sys/cyclic.h> |
| 97#include <sys/callo.h> |
|
| 97#else /* FreeBSD */ 98#include <sys/callout.h> 99#endif | 98#else /* FreeBSD */ 99#include <sys/callout.h> 100#endif |
| 100 | 101#include <sys/disp.h> |
| 101#include <machine/stdarg.h> 102 103#include <vm/vm.h> 104#include <vm/vm_page.h> 105#include <vm/vm_object.h> 106#include <vm/vm_kern.h> 107#include <vm/vm_map.h> 108/* There is clash. vm_map.h defines the two below and vdev_cache.c use them. */ --- 40 unchanged lines hidden --- | 102#include <machine/stdarg.h> 103 104#include <vm/vm.h> 105#include <vm/vm_page.h> 106#include <vm/vm_object.h> 107#include <vm/vm_kern.h> 108#include <vm/vm_map.h> 109/* There is clash. vm_map.h defines the two below and vdev_cache.c use them. */ --- 40 unchanged lines hidden --- |