aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDan Kimmel <dan.kimmel@delphix.com>2016-06-12 22:47:35 -0400
committerBrian Behlendorf <behlendorf1@llnl.gov>2016-09-13 09:59:09 -0700
commitc4434877ae449a637d0f302eca80fcaad354874f (patch)
tree7c93c750bbb6c50dc3316331a4325fa739627f2a /include
parentc17bcf83da14f7f05641dfabb7160025a93641c1 (diff)
Remove lint suppression from dmu.h and unnecessary dmu.h include in spa.h
Authored by: Dan Kimmel <dan.kimmel@delphix.com> Reviewed by: Tom Caputi <tcaputi@datto.com> Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov> Ported by: David Quigley <david.quigley@intel.com> Issue #5078
Diffstat (limited to 'include')
-rw-r--r--include/sys/dmu.h8
-rw-r--r--include/sys/spa.h3
2 files changed, 2 insertions, 9 deletions
diff --git a/include/sys/dmu.h b/include/sys/dmu.h
index 83919a624..4efab7c72 100644
--- a/include/sys/dmu.h
+++ b/include/sys/dmu.h
@@ -562,12 +562,7 @@ typedef struct dmu_buf_user {
* NOTE: This function should only be called once on a given dmu_buf_user_t.
* To allow enforcement of this, dbu must already be zeroed on entry.
*/
-#ifdef __lint
-/* Very ugly, but it beats issuing suppression directives in many Makefiles. */
-extern void
-dmu_buf_init_user(dmu_buf_user_t *dbu, dmu_buf_evict_func_t *evict_func,
- dmu_buf_t **clear_on_evict_dbufp);
-#else /* __lint */
+/*ARGSUSED*/
static inline void
dmu_buf_init_user(dmu_buf_user_t *dbu, dmu_buf_evict_func_t *evict_func,
dmu_buf_t **clear_on_evict_dbufp)
@@ -580,7 +575,6 @@ dmu_buf_init_user(dmu_buf_user_t *dbu, dmu_buf_evict_func_t *evict_func,
dbu->dbu_clear_on_evict_dbufp = clear_on_evict_dbufp;
#endif
}
-#endif /* __lint */
/*
* Attach user data to a dbuf and mark it for normal (when the dbuf's
diff --git a/include/sys/spa.h b/include/sys/spa.h
index 320c58402..0c71cca68 100644
--- a/include/sys/spa.h
+++ b/include/sys/spa.h
@@ -36,6 +36,7 @@
#include <sys/types.h>
#include <sys/fs/zfs.h>
#include <sys/spa_checksum.h>
+#include <sys/dmu.h>
#ifdef __cplusplus
extern "C" {
@@ -558,8 +559,6 @@ _NOTE(CONSTCOND) } while (0)
ASSERT(len < size); \
}
-#include <sys/dmu.h>
-
#define BP_GET_BUFC_TYPE(bp) \
(((BP_GET_LEVEL(bp) > 0) || (DMU_OT_IS_METADATA(BP_GET_TYPE(bp)))) ? \
ARC_BUFC_METADATA : ARC_BUFC_DATA)