c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-26 18:04:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove lint suppression from dmu.h and unnecessary dmu.h include in spa.h

Browse Source 
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
This commit is contained in:
Dan Kimmel 2016-06-12 22:47:35 -04:00 committed by Brian Behlendorf
parent c17bcf83da
commit c4434877ae
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/sys/dmu.h
View File

@ -562,12 +562,7 @@ typedef struct dmu_buf_user {
* NOTE: This function should only be called once on a given dmu_buf_user_t. * 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. * To allow enforcement of this, dbu must already be zeroed on entry.
*/ */
#ifdef __lint /*ARGSUSED*/
/* 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 */
static inline void static inline void
dmu_buf_init_user(dmu_buf_user_t *dbu, dmu_buf_evict_func_t *evict_func, dmu_buf_init_user(dmu_buf_user_t *dbu, dmu_buf_evict_func_t *evict_func,
dmu_buf_t **clear_on_evict_dbufp) 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; dbu->dbu_clear_on_evict_dbufp = clear_on_evict_dbufp;
#endif #endif
} }
#endif /* __lint */
/* /*
* Attach user data to a dbuf and mark it for normal (when the dbuf's * Attach user data to a dbuf and mark it for normal (when the dbuf's

3
include/sys/spa.h
View File

@ -36,6 +36,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/fs/zfs.h> #include <sys/fs/zfs.h>
#include <sys/spa_checksum.h> #include <sys/spa_checksum.h>
#include <sys/dmu.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -558,8 +559,6 @@ _NOTE(CONSTCOND) } while (0)
ASSERT(len < size); \ ASSERT(len < size); \
} }
#include <sys/dmu.h>
#define BP_GET_BUFC_TYPE(bp) \ #define BP_GET_BUFC_TYPE(bp) \
(((BP_GET_LEVEL(bp) > 0) || (DMU_OT_IS_METADATA(BP_GET_TYPE(bp)))) ? \ (((BP_GET_LEVEL(bp) > 0) || (DMU_OT_IS_METADATA(BP_GET_TYPE(bp)))) ? \
ARC_BUFC_METADATA : ARC_BUFC_DATA) ARC_BUFC_METADATA : ARC_BUFC_DATA)