mirror of
				https://git.proxmox.com/git/mirror_zfs
				synced 2025-10-31 15:26:31 +00:00 
			
		
		
		
	dkio: remove kernel dkio.h compatibility header
Without DKIOCFLUSHWRITECACHE, we no longer need the compat header. Note that we're keeping the userspace SPL compat header, which is used by libefi. Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Alexander Motin <mav@FreeBSD.org> Signed-off-by: Rob Norris <rob.norris@klarasystems.com> Closes #16064
This commit is contained in:
		
							parent
							
								
									c9c838aa1f
								
							
						
					
					
						commit
						b613709c46
					
				| @ -20,7 +20,6 @@ noinst_HEADERS = \ | ||||
| 	%D%/spl/sys/debug.h \
 | ||||
| 	%D%/spl/sys/dirent.h \
 | ||||
| 	%D%/spl/sys/disp.h \
 | ||||
| 	%D%/spl/sys/dkio.h \
 | ||||
| 	%D%/spl/sys/fcntl.h \
 | ||||
| 	%D%/spl/sys/file.h \
 | ||||
| 	%D%/spl/sys/freebsd_rwlock.h \
 | ||||
|  | ||||
| @ -1,34 +0,0 @@ | ||||
| /*
 | ||||
|  * CDDL HEADER START | ||||
|  * | ||||
|  * The contents of this file are subject to the terms of the | ||||
|  * Common Development and Distribution License (the "License"). | ||||
|  * You may not use this file except in compliance with the License. | ||||
|  * | ||||
|  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE | ||||
|  * or https://opensource.org/licenses/CDDL-1.0.
 | ||||
|  * See the License for the specific language governing permissions | ||||
|  * and limitations under the License. | ||||
|  * | ||||
|  * When distributing Covered Code, include this CDDL HEADER in each | ||||
|  * file and include the License file at usr/src/OPENSOLARIS.LICENSE. | ||||
|  * If applicable, add the following below this CDDL HEADER, with the | ||||
|  * fields enclosed by brackets "[]" replaced with your own identifying | ||||
|  * information: Portions Copyright [yyyy] [name of copyright owner] | ||||
|  * | ||||
|  * CDDL HEADER END | ||||
|  * | ||||
|  * $FreeBSD$ | ||||
|  */ | ||||
| /*
 | ||||
|  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved. | ||||
|  * Use is subject to license terms. | ||||
|  */ | ||||
| 
 | ||||
| #ifndef _OPENSOLARIS_SYS_DKIO_H_ | ||||
| #define	_OPENSOLARIS_SYS_DKIO_H_ | ||||
| 
 | ||||
| #define	DKIOC		(0x04 << 8) | ||||
| #define	DKIOCFLUSHWRITECACHE	(DKIOC|34)	/* flush cache to phys medium */ | ||||
| 
 | ||||
| #endif /* _OPENSOLARIS_SYS_DKIO_H_ */ | ||||
| @ -63,7 +63,6 @@ kernel_spl_sys_HEADERS = \ | ||||
| 	%D%/spl/sys/ctype.h \
 | ||||
| 	%D%/spl/sys/debug.h \
 | ||||
| 	%D%/spl/sys/disp.h \
 | ||||
| 	%D%/spl/sys/dkio.h \
 | ||||
| 	%D%/spl/sys/errno.h \
 | ||||
| 	%D%/spl/sys/fcntl.h \
 | ||||
| 	%D%/spl/sys/file.h \
 | ||||
|  | ||||
| @ -1,39 +0,0 @@ | ||||
| /*
 | ||||
|  *  Copyright (C) 2007-2010 Lawrence Livermore National Security, LLC. | ||||
|  *  Copyright (C) 2007 The Regents of the University of California. | ||||
|  *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER). | ||||
|  *  Written by Brian Behlendorf <behlendorf1@llnl.gov>. | ||||
|  *  UCRL-CODE-235197 | ||||
|  * | ||||
|  *  This file is part of the SPL, Solaris Porting Layer. | ||||
|  * | ||||
|  *  The SPL is free software; you can redistribute it and/or modify it | ||||
|  *  under the terms of the GNU General Public License as published by the | ||||
|  *  Free Software Foundation; either version 2 of the License, or (at your | ||||
|  *  option) any later version. | ||||
|  * | ||||
|  *  The SPL is distributed in the hope that it will be useful, but WITHOUT | ||||
|  *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||||
|  *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License | ||||
|  *  for more details. | ||||
|  * | ||||
|  *  You should have received a copy of the GNU General Public License along | ||||
|  *  with the SPL.  If not, see <http://www.gnu.org/licenses/>.
 | ||||
|  */ | ||||
| 
 | ||||
| #ifndef _SPL_DKIO_H | ||||
| #define	_SPL_DKIO_H | ||||
| 
 | ||||
| #define	DFL_SZ(num_exts) \ | ||||
| 	(sizeof (dkioc_free_list_t) + (num_exts - 1) * 16) | ||||
| 
 | ||||
| #define	DKIOC		(0x04 << 8) | ||||
| #define	DKIOCFLUSHWRITECACHE	(DKIOC|34)	/* flush cache to phys medium */ | ||||
| 
 | ||||
| /*
 | ||||
|  * ioctl to free space (e.g. SCSI UNMAP) off a disk. | ||||
|  * Pass a dkioc_free_list_t containing a list of extents to be freed. | ||||
|  */ | ||||
| #define	DKIOCFREE	(DKIOC|50) | ||||
| 
 | ||||
| #endif /* _SPL_DKIO_H */ | ||||
| @ -35,7 +35,6 @@ | ||||
| #include <sys/nvpair.h> | ||||
| #include <sys/space_map.h> | ||||
| #include <sys/vdev.h> | ||||
| #include <sys/dkio.h> | ||||
| #include <sys/uberblock_impl.h> | ||||
| #include <sys/vdev_indirect_mapping.h> | ||||
| #include <sys/vdev_indirect_births.h> | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Rob Norris
						Rob Norris