mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 02:27:36 +03:00
Rename refcount.h to zfs_refcount.h
Renamed to avoid conflicting with refcount.h when a different implementation is already provided by the platform. Reviewed-by: Ryan Moeller <ryan@ixsystems.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Matt Macy <mmacy@FreeBSD.org> Closes #10620
This commit is contained in:
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/mutex.h>
|
||||
#include <sys/vnode.h>
|
||||
#include <sys/taskq.h>
|
||||
|
||||
#include <sys/ccompat.h>
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <sys/zio_checksum.h>
|
||||
#include <sys/zfs_context.h>
|
||||
#include <sys/arc.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/zfs_refcount.h>
|
||||
#include <sys/vdev.h>
|
||||
#include <sys/vdev_trim.h>
|
||||
#include <sys/vdev_impl.h>
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
#include <sys/dmu.h>
|
||||
#include <sys/avl.h>
|
||||
#include <sys/zap.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/nvpair.h>
|
||||
#ifdef _KERNEL
|
||||
#include <sys/sid.h>
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
#include <sys/sysmacros.h>
|
||||
#include <sys/resource.h>
|
||||
#include <sys/vfs.h>
|
||||
#include <sys/endian.h>
|
||||
#include <sys/vm.h>
|
||||
#include <sys/vnode.h>
|
||||
#include <sys/dirent.h>
|
||||
|
||||
@@ -56,14 +56,13 @@
|
||||
#include <sys/dmu.h>
|
||||
#include <sys/dmu_objset.h>
|
||||
#include <sys/dmu_tx.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/zfs_refcount.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/zap.h>
|
||||
#include <sys/zfs_znode.h>
|
||||
#include <sys/sa.h>
|
||||
#include <sys/zfs_sa.h>
|
||||
#include <sys/zfs_stat.h>
|
||||
#include <sys/refcount.h>
|
||||
|
||||
#include "zfs_prop.h"
|
||||
#include "zfs_comutil.h"
|
||||
|
||||
@@ -78,7 +78,6 @@
|
||||
#include <sys/fs/zfs.h>
|
||||
#include <sys/zfs_ioctl.h>
|
||||
#include <sys/zil.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/zfs_znode.h>
|
||||
#include <sys/zfs_rlock.h>
|
||||
#include <sys/vdev_impl.h>
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <sys/zio_checksum.h>
|
||||
#include <sys/zfs_context.h>
|
||||
#include <sys/arc.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/zfs_refcount.h>
|
||||
#include <sys/vdev.h>
|
||||
#include <sys/vdev_trim.h>
|
||||
#include <sys/vdev_impl.h>
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
#include <sys/dmu.h>
|
||||
#include <sys/dmu_objset.h>
|
||||
#include <sys/dmu_tx.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/zfs_refcount.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/zap.h>
|
||||
#include <sys/zfs_znode.h>
|
||||
|
||||
+1
-1
@@ -284,7 +284,7 @@
|
||||
#include <sys/zio_checksum.h>
|
||||
#include <sys/zfs_context.h>
|
||||
#include <sys/arc.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/zfs_refcount.h>
|
||||
#include <sys/vdev.h>
|
||||
#include <sys/vdev_impl.h>
|
||||
#include <sys/dsl_pool.h>
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@
|
||||
|
||||
#include <sys/bpobj.h>
|
||||
#include <sys/zfs_context.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/zfs_refcount.h>
|
||||
#include <sys/dsl_pool.h>
|
||||
#include <sys/zfeature.h>
|
||||
#include <sys/zap.h>
|
||||
|
||||
@@ -33,7 +33,6 @@
|
||||
#include <sys/dsl_dir.h>
|
||||
#include <sys/dsl_pool.h>
|
||||
#include <sys/dnode.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/spa.h>
|
||||
|
||||
/*
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
*/
|
||||
|
||||
#include <sys/dmu.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/zap.h>
|
||||
#include <sys/zfs_context.h>
|
||||
#include <sys/dsl_pool.h>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/zfs_context.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/zfs_refcount.h>
|
||||
|
||||
/*
|
||||
* Reference count tracking is disabled by default. It's memory requirements
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
* Copyright (c) 2012 by Delphix. All rights reserved.
|
||||
*/
|
||||
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/rrwlock.h>
|
||||
#include <sys/trace_zfs.h>
|
||||
|
||||
|
||||
@@ -34,7 +34,6 @@
|
||||
#include <sys/dsl_pool.h>
|
||||
#include <sys/zio.h>
|
||||
#include <sys/space_map.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/zfeature.h>
|
||||
|
||||
/*
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
#include <sys/zio.h>
|
||||
#include <sys/zio_checksum.h>
|
||||
#include <sys/metaslab.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/dmu.h>
|
||||
#include <sys/vdev_indirect_mapping.h>
|
||||
#include <sys/dmu_tx.h>
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
#include <sys/spa_impl.h>
|
||||
#include <sys/txg.h>
|
||||
#include <sys/vdev_impl.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/metaslab_impl.h>
|
||||
#include <sys/dsl_synctask.h>
|
||||
#include <sys/zap.h>
|
||||
|
||||
@@ -29,7 +29,6 @@
|
||||
#include <sys/txg.h>
|
||||
#include <sys/vdev_impl.h>
|
||||
#include <sys/vdev_trim.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/metaslab_impl.h>
|
||||
#include <sys/dsl_synctask.h>
|
||||
#include <sys/zap.h>
|
||||
|
||||
@@ -45,7 +45,6 @@
|
||||
#include <sys/zfs_znode.h>
|
||||
#include <sys/fs/zfs.h>
|
||||
#include <sys/zap.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/zap_impl.h>
|
||||
#include <sys/zap_leaf.h>
|
||||
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
#include <sys/dmu.h>
|
||||
#include <sys/zfs_context.h>
|
||||
#include <sys/zap.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/zap_impl.h>
|
||||
#include <sys/zap_leaf.h>
|
||||
#include <sys/avl.h>
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
#include <sys/dmu.h>
|
||||
#include <sys/avl.h>
|
||||
#include <sys/zap.h>
|
||||
#include <sys/refcount.h>
|
||||
#include <sys/nvpair.h>
|
||||
#ifdef _KERNEL
|
||||
#include <sys/sid.h>
|
||||
|
||||
Reference in New Issue
Block a user