Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch

Conflicts: module/zfs/rrwlock.c module/zfs/spa_boot.c module/zfs/zfs_replay.c
2009-03-11 11:12:24 -07:00 · 2009-03-11 11:12:24 -07:00 · bf200630f9
parent 0c8622c47c c143e6e5b9
commit bf200630f9
87 changed files with 86 additions and 92 deletions
--- a/cmd/zdb/zdb_il.c
+++ b/cmd/zdb/zdb_il.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 /*
 * Print intent log header and statistics.
--- a/cmd/zfs/zfs_util.h
+++ b/cmd/zfs/zfs_util.h
@ -26,7 +26,7 @@
 #ifndef	_ZFS_UTIL_H
 #define	_ZFS_UTIL_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <libzfs.h>

--- a/cmd/zinject/zinject.c
+++ b/cmd/zinject/zinject.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 /*
 * ZFS Fault Injector
--- a/cmd/zinject/zinject.h
+++ b/cmd/zinject/zinject.h
@ -26,7 +26,7 @@
 #ifndef	_ZINJECT_H
 #define	_ZINJECT_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/zfs_ioctl.h>

--- a/cmd/zpool/zpool_iter.c
+++ b/cmd/zpool/zpool_iter.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <libintl.h>
 #include <libuutil.h>
--- a/cmd/zpool/zpool_util.c
+++ b/cmd/zpool/zpool_util.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <errno.h>
 #include <libgen.h>
--- a/lib/libnvpair/include/libnvpair.h
+++ b/lib/libnvpair/include/libnvpair.h
@ -26,7 +26,7 @@
 #ifndef	_LIBNVPAIR_H
 #define	_LIBNVPAIR_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/nvpair.h>
 #include <stdlib.h>
--- a/lib/libnvpair/libnvpair.c
+++ b/lib/libnvpair/libnvpair.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <unistd.h>
 #include <strings.h>
--- a/lib/libnvpair/nvpair_alloc_system.c
+++ b/lib/libnvpair/nvpair_alloc_system.c
@ -24,7 +24,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/kmem.h>
 #include <sys/nvpair.h>
--- a/lib/libuutil/include/libuutil_common.h
+++ b/lib/libuutil/include/libuutil_common.h
@ -27,7 +27,7 @@
 #ifndef	_LIBUUTIL_COMMON_H
 #define	_LIBUUTIL_COMMON_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <libuutil.h>
 #include <libuutil_impl.h>
--- a/lib/libuutil/include/libuutil_impl.h
+++ b/lib/libuutil/include/libuutil_impl.h
@ -27,7 +27,7 @@
 #ifndef	_LIBUUTIL_IMPL_H
 #define	_LIBUUTIL_IMPL_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <libuutil.h>
 #include <pthread.h>
@ -40,11 +40,11 @@ extern "C" {
 #endif

 void uu_set_error(uint_t);
-#pragma rarely_called(uu_set_error)
+

 /*PRINTFLIKE1*/
 void uu_panic(const char *format, ...);
-#pragma rarely_called(uu_panic)
+

 struct uu_dprintf {
 	char	*uud_name;
--- a/lib/libuutil/uu_avl.c
+++ b/lib/libuutil/uu_avl.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include "libuutil_common.h"

--- a/lib/libuutil/uu_dprintf.c
+++ b/lib/libuutil/uu_dprintf.c
@ -24,7 +24,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include "libuutil_common.h"

--- a/lib/libuutil/uu_ident.c
+++ b/lib/libuutil/uu_ident.c
@ -24,7 +24,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include "libuutil_common.h"

--- a/lib/libuutil/uu_list.c
+++ b/lib/libuutil/uu_list.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include "libuutil_common.h"

--- a/lib/libuutil/uu_misc.c
+++ b/lib/libuutil/uu_misc.c
@ -24,7 +24,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include "libuutil_common.h"

--- a/lib/libuutil/uu_open.c
+++ b/lib/libuutil/uu_open.c
@ -24,7 +24,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include "libuutil_common.h"

--- a/lib/libuutil/uu_pname.c
+++ b/lib/libuutil/uu_pname.c
@ -24,7 +24,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include "libuutil_common.h"

--- a/lib/libuutil/uu_strtoint.c
+++ b/lib/libuutil/uu_strtoint.c
@ -24,7 +24,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include "libuutil_common.h"

--- a/lib/libzfs/libzfs_config.c
+++ b/lib/libzfs/libzfs_config.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 /*
 * The pool configuration repository is stored in /etc/zfs/zpool.cache as a
--- a/lib/libzfs/libzfs_graph.c
+++ b/lib/libzfs/libzfs_graph.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 /*
 * Iterate over all children of the current object.  This includes the normal
--- a/lib/libzfs/libzfs_import.c
+++ b/lib/libzfs/libzfs_import.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 /*
 * Pool import support functions.
--- a/module/avl/avl.c
+++ b/module/avl/avl.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+


 /*
--- a/module/avl/include/sys/avl.h
+++ b/module/avl/include/sys/avl.h
@ -26,7 +26,7 @@
 #ifndef	_AVL_H
 #define	_AVL_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 /*
 * This is a private header file.  Applications should not directly include
--- a/module/avl/include/sys/avl_impl.h
+++ b/module/avl/include/sys/avl_impl.h
@ -27,7 +27,7 @@
 #ifndef	_AVL_IMPL_H
 #define	_AVL_IMPL_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 /*
 * This is a private header file.  Applications should not directly include
--- a/module/nvpair/include/sys/nvpair.h
+++ b/module/nvpair/include/sys/nvpair.h
@ -26,7 +26,7 @@
 #ifndef	_SYS_NVPAIR_H
 #define	_SYS_NVPAIR_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/types.h>
 #include <sys/errno.h>
--- a/module/nvpair/include/sys/nvpair_impl.h
+++ b/module/nvpair/include/sys/nvpair_impl.h
@ -27,7 +27,7 @@
 #ifndef	_NVPAIR_IMPL_H
 #define	_NVPAIR_IMPL_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #ifdef __cplusplus
 extern "C" {
--- a/module/nvpair/nvpair.c
+++ b/module/nvpair/nvpair.c
@ -24,7 +24,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/stropts.h>
 #include <sys/debug.h>
--- a/module/unicode/include/sys/u8_textprep.h
+++ b/module/unicode/include/sys/u8_textprep.h
@ -26,7 +26,7 @@
 #ifndef	_SYS_U8_TEXTPREP_H
 #define	_SYS_U8_TEXTPREP_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/isa_defs.h>
 #include <sys/types.h>
--- a/module/unicode/include/sys/u8_textprep_data.h
+++ b/module/unicode/include/sys/u8_textprep_data.h
@ -68,7 +68,7 @@
 #ifndef _SYS_U8_TEXTPREP_DATA_H
 #define	_SYS_U8_TEXTPREP_DATA_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/types.h>

--- a/module/unicode/u8_textprep.c
+++ b/module/unicode/u8_textprep.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+


 /*
--- a/module/unicode/uconv.c
+++ b/module/unicode/uconv.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 /*
 * Unicode encoding conversion functions among UTF-8, UTF-16, and UTF-32.
--- a/module/zcommon/include/sys/fm/fs/zfs.h
+++ b/module/zcommon/include/sys/fm/fs/zfs.h
@ -26,7 +26,7 @@
 #ifndef	_SYS_FM_FS_ZFS_H
 #define	_SYS_FM_FS_ZFS_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #ifdef	__cplusplus
 extern "C" {
--- a/module/zcommon/include/zfs_comutil.h
+++ b/module/zcommon/include/zfs_comutil.h
@ -26,7 +26,7 @@
 #ifndef	_ZFS_COMUTIL_H
 #define	_ZFS_COMUTIL_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/fs/zfs.h>
 #include <sys/types.h>
--- a/module/zcommon/include/zfs_deleg.h
+++ b/module/zcommon/include/zfs_deleg.h
@ -26,7 +26,7 @@
 #ifndef	_ZFS_DELEG_H
 #define	_ZFS_DELEG_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/fs/zfs.h>

--- a/module/zcommon/include/zfs_namecheck.h
+++ b/module/zcommon/include/zfs_namecheck.h
@ -26,7 +26,7 @@
 #ifndef	_ZFS_NAMECHECK_H
 #define	_ZFS_NAMECHECK_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #ifdef	__cplusplus
 extern "C" {
--- a/module/zcommon/include/zfs_prop.h
+++ b/module/zcommon/include/zfs_prop.h
@ -26,7 +26,7 @@
 #ifndef	_ZFS_PROP_H
 #define	_ZFS_PROP_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/fs/zfs.h>
 #include <sys/types.h>
--- a/module/zcommon/zfs_comutil.c
+++ b/module/zcommon/zfs_comutil.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 /*
 * This file is intended for functions that ought to be common between user
--- a/module/zcommon/zfs_deleg.c
+++ b/module/zcommon/zfs_deleg.c
@ -24,7 +24,7 @@
 */


-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #if defined(_KERNEL)
 #include <sys/systm.h>
--- a/module/zcommon/zfs_namecheck.c
+++ b/module/zcommon/zfs_namecheck.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 /*
 * Common name validation routines for ZFS.  These routines are shared by the
--- a/module/zcommon/zprop_common.c
+++ b/module/zcommon/zprop_common.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 /*
 * Common routines used by zfs and zpool property management.
--- a/module/zfs/dmu_object.c
+++ b/module/zfs/dmu_object.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/dmu.h>
 #include <sys/dmu_objset.h>
--- a/module/zfs/dmu_zfetch.c
+++ b/module/zfs/dmu_zfetch.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/zfs_context.h>
 #include <sys/dnode.h>
--- a/module/zfs/dsl_deleg.c
+++ b/module/zfs/dsl_deleg.c
@ -66,7 +66,7 @@
 * The ZAP OBJ is referred to as the jump object.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/dmu.h>
 #include <sys/dmu_objset.h>
--- a/module/zfs/dsl_prop.c
+++ b/module/zfs/dsl_prop.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/dmu.h>
 #include <sys/dmu_objset.h>
--- a/module/zfs/dsl_synctask.c
+++ b/module/zfs/dsl_synctask.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/dmu.h>
 #include <sys/dmu_tx.h>
--- a/module/zfs/fletcher.c
+++ b/module/zfs/fletcher.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/types.h>
 #include <sys/sysmacros.h>
--- a/module/zfs/gzip.c
+++ b/module/zfs/gzip.c
@ -24,7 +24,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/debug.h>
 #include <sys/types.h>
--- a/module/zfs/include/sys/dmu_tx.h
+++ b/module/zfs/include/sys/dmu_tx.h
@ -26,7 +26,7 @@
 #ifndef	_SYS_DMU_TX_H
 #define	_SYS_DMU_TX_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/inttypes.h>
 #include <sys/dmu.h>
--- a/module/zfs/include/sys/dmu_zfetch.h
+++ b/module/zfs/include/sys/dmu_zfetch.h
@ -26,7 +26,7 @@
 #ifndef	_DFETCH_H
 #define	_DFETCH_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/zfs_context.h>

--- a/module/zfs/include/sys/dsl_deleg.h
+++ b/module/zfs/include/sys/dsl_deleg.h
@ -26,7 +26,7 @@
 #ifndef	_SYS_DSL_DELEG_H
 #define	_SYS_DSL_DELEG_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/dmu.h>
 #include <sys/dsl_pool.h>
--- a/module/zfs/include/sys/dsl_prop.h
+++ b/module/zfs/include/sys/dsl_prop.h
@ -26,7 +26,7 @@
 #ifndef	_SYS_DSL_PROP_H
 #define	_SYS_DSL_PROP_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/dmu.h>
 #include <sys/dsl_pool.h>
--- a/module/zfs/include/sys/dsl_synctask.h
+++ b/module/zfs/include/sys/dsl_synctask.h
@ -26,7 +26,7 @@
 #ifndef	_SYS_DSL_SYNCTASK_H
 #define	_SYS_DSL_SYNCTASK_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/txg.h>
 #include <sys/zfs_context.h>
--- a/module/zfs/include/sys/metaslab_impl.h
+++ b/module/zfs/include/sys/metaslab_impl.h
@ -26,7 +26,7 @@
 #ifndef _SYS_METASLAB_IMPL_H
 #define	_SYS_METASLAB_IMPL_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/metaslab.h>
 #include <sys/space_map.h>
--- a/module/zfs/include/sys/refcount.h
+++ b/module/zfs/include/sys/refcount.h
@ -26,7 +26,7 @@
 #ifndef	_SYS_REFCOUNT_H
 #define	_SYS_REFCOUNT_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/inttypes.h>
 #include <sys/list.h>
--- a/module/zfs/include/sys/rrwlock.h
+++ b/module/zfs/include/sys/rrwlock.h
@ -26,7 +26,7 @@
 #ifndef	_SYS_RR_RW_LOCK_H
 #define	_SYS_RR_RW_LOCK_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #ifdef	__cplusplus
 extern "C" {
--- a/module/zfs/include/sys/spa_boot.h
+++ b/module/zfs/include/sys/spa_boot.h
@ -26,7 +26,7 @@
 #ifndef _SYS_SPA_BOOT_H
 #define	_SYS_SPA_BOOT_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/nvpair.h>

--- a/module/zfs/include/sys/txg.h
+++ b/module/zfs/include/sys/txg.h
@ -26,7 +26,7 @@
 #ifndef _SYS_TXG_H
 #define	_SYS_TXG_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/spa.h>
 #include <sys/zfs_context.h>
--- a/module/zfs/include/sys/uberblock.h
+++ b/module/zfs/include/sys/uberblock.h
@ -27,7 +27,7 @@
 #ifndef _SYS_UBERBLOCK_H
 #define	_SYS_UBERBLOCK_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/spa.h>
 #include <sys/vdev.h>
--- a/module/zfs/include/sys/unique.h
+++ b/module/zfs/include/sys/unique.h
@ -26,7 +26,7 @@
 #ifndef	_SYS_UNIQUE_H
 #define	_SYS_UNIQUE_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/zfs_context.h>

--- a/module/zfs/include/sys/vdev_file.h
+++ b/module/zfs/include/sys/vdev_file.h
@ -27,7 +27,7 @@
 #ifndef _SYS_VDEV_FILE_H
 #define	_SYS_VDEV_FILE_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/vdev.h>

--- a/module/zfs/include/sys/zap.h
+++ b/module/zfs/include/sys/zap.h
@ -26,7 +26,7 @@
 #ifndef	_SYS_ZAP_H
 #define	_SYS_ZAP_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 /*
 * ZAP - ZFS Attribute Processor
--- a/module/zfs/include/sys/zap_impl.h
+++ b/module/zfs/include/sys/zap_impl.h
@ -26,7 +26,7 @@
 #ifndef	_SYS_ZAP_IMPL_H
 #define	_SYS_ZAP_IMPL_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/zap.h>
 #include <sys/zfs_context.h>
--- a/module/zfs/include/sys/zap_leaf.h
+++ b/module/zfs/include/sys/zap_leaf.h
@ -26,7 +26,7 @@
 #ifndef	_SYS_ZAP_LEAF_H
 #define	_SYS_ZAP_LEAF_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #ifdef	__cplusplus
 extern "C" {
--- a/module/zfs/include/sys/zfs_context.h
+++ b/module/zfs/include/sys/zfs_context.h
@ -26,7 +26,7 @@
 #ifndef _SYS_ZFS_CONTEXT_H
 #define	_SYS_ZFS_CONTEXT_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #ifdef	__cplusplus
 extern "C" {
--- a/module/zfs/include/sys/zfs_ctldir.h
+++ b/module/zfs/include/sys/zfs_ctldir.h
@ -26,7 +26,7 @@
 #ifndef	_ZFS_CTLDIR_H
 #define	_ZFS_CTLDIR_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/pathname.h>
 #include <sys/vnode.h>
--- a/module/zfs/include/sys/zfs_debug.h
+++ b/module/zfs/include/sys/zfs_debug.h
@ -26,7 +26,7 @@
 #ifndef _SYS_ZFS_DEBUG_H
 #define	_SYS_ZFS_DEBUG_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #ifdef	__cplusplus
 extern "C" {
--- a/module/zfs/include/sys/zfs_dir.h
+++ b/module/zfs/include/sys/zfs_dir.h
@ -26,7 +26,7 @@
 #ifndef	_SYS_FS_ZFS_DIR_H
 #define	_SYS_FS_ZFS_DIR_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/pathname.h>
 #include <sys/dmu.h>
--- a/module/zfs/include/sys/zfs_fuid.h
+++ b/module/zfs/include/sys/zfs_fuid.h
@ -26,7 +26,7 @@
 #ifndef	_SYS_FS_ZFS_FUID_H
 #define	_SYS_FS_ZFS_FUID_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #ifdef _KERNEL
 #include <sys/kidmap.h>
--- a/module/zfs/include/sys/zfs_ioctl.h
+++ b/module/zfs/include/sys/zfs_ioctl.h
@ -26,7 +26,7 @@
 #ifndef	_SYS_ZFS_IOCTL_H
 #define	_SYS_ZFS_IOCTL_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/cred.h>
 #include <sys/dmu.h>
--- a/module/zfs/include/sys/zfs_rlock.h
+++ b/module/zfs/include/sys/zfs_rlock.h
@ -26,7 +26,7 @@
 #ifndef	_SYS_FS_ZFS_RLOCK_H
 #define	_SYS_FS_ZFS_RLOCK_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #ifdef	__cplusplus
 extern "C" {
--- a/module/zfs/include/sys/zio_compress.h
+++ b/module/zfs/include/sys/zio_compress.h
@ -27,7 +27,7 @@
 #ifndef _SYS_ZIO_COMPRESS_H
 #define	_SYS_ZIO_COMPRESS_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/zio.h>

--- a/module/zfs/include/sys/zvol.h
+++ b/module/zfs/include/sys/zvol.h
@ -27,7 +27,7 @@
 #ifndef	_SYS_ZVOL_H
 #define	_SYS_ZVOL_H

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/zfs_context.h>

--- a/module/zfs/lzjb.c
+++ b/module/zfs/lzjb.c
@ -24,7 +24,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 /*
 * We keep our own copy of this algorithm for 2 main reasons:
--- a/module/zfs/refcount.c
+++ b/module/zfs/refcount.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/zfs_context.h>
 #include <sys/refcount.h>
--- a/module/zfs/rrwlock.c
+++ b/module/zfs/rrwlock.c
@ -25,8 +25,6 @@

 #ifdef HAVE_ZPL

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/refcount.h>
 #include <sys/rrwlock.h>

--- a/module/zfs/sha256.c
+++ b/module/zfs/sha256.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/zfs_context.h>
 #include <sys/zio.h>
--- a/module/zfs/spa_boot.c
+++ b/module/zfs/spa_boot.c
@ -26,8 +26,6 @@

 #ifdef _KERNEL

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/spa.h>
 #include <sys/sunddi.h>

--- a/module/zfs/spa_errlog.c
+++ b/module/zfs/spa_errlog.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 /*
 * Routines to manage the on-disk persistent error log.
--- a/module/zfs/spa_history.c
+++ b/module/zfs/spa_history.c
@ -24,7 +24,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/spa.h>
 #include <sys/spa_impl.h>
--- a/module/zfs/uberblock.c
+++ b/module/zfs/uberblock.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/zfs_context.h>
 #include <sys/uberblock_impl.h>
--- a/module/zfs/unique.c
+++ b/module/zfs/unique.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/zfs_context.h>
 #include <sys/avl.h>
--- a/module/zfs/zap.c
+++ b/module/zfs/zap.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+


 /*
--- a/module/zfs/zap_leaf.c
+++ b/module/zfs/zap_leaf.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 /*
 * The 512-byte leaf is broken into 32 16-byte chunks.
--- a/module/zfs/zap_micro.c
+++ b/module/zfs/zap_micro.c
@ -23,7 +23,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/spa.h>
 #include <sys/dmu.h>
--- a/module/zfs/zfs_replay.c
+++ b/module/zfs/zfs_replay.c
@ -25,8 +25,6 @@

 #ifdef HAVE_ZPL

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
--- a/module/zfs/zio_compress.c
+++ b/module/zfs/zio_compress.c
@ -24,7 +24,7 @@
 * Use is subject to license terms.
 */

-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+

 #include <sys/zfs_context.h>
 #include <sys/compress.h>