From fc386db1916dd946512d9b965d4d354582be1f9e Mon Sep 17 00:00:00 2001 From: Giuseppe Di Natale Date: Wed, 1 Feb 2017 16:47:04 -0800 Subject: [PATCH] Remove lint ifdef checks in zdb and dbuf This is effectively dead code for the Linux implementation which can be removed to improve readability. We want to linter to check the real production/debug build as much as possible. Reviewed-by: Brian Behlendorf Reviewed-by: George Melikov Signed-off-by: Giuseppe Di Natale Closes #5722 --- cmd/zdb/zdb.c | 7 ------- module/zfs/dbuf.c | 2 -- 2 files changed, 9 deletions(-) diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c index cc4b0340f7..882fbae955 100644 --- a/cmd/zdb/zdb.c +++ b/cmd/zdb/zdb.c @@ -83,17 +83,10 @@ zdb_ot_name(dmu_object_type_t type) return ("UNKNOWN"); } -#ifndef lint extern int reference_tracking_enable; extern int zfs_recover; extern uint64_t zfs_arc_max, zfs_arc_meta_limit; extern int zfs_vdev_async_read_max_active; -#else -int reference_tracking_enable; -int zfs_recover; -uint64_t zfs_arc_max, zfs_arc_meta_limit; -int zfs_vdev_async_read_max_active; -#endif const char cmdname[] = "zdb"; uint8_t dump_opt[256]; diff --git a/module/zfs/dbuf.c b/module/zfs/dbuf.c index d2e65dd9c3..173e1dbb8e 100644 --- a/module/zfs/dbuf.c +++ b/module/zfs/dbuf.c @@ -78,12 +78,10 @@ uint_t zfs_dbuf_evict_key; static boolean_t dbuf_undirty(dmu_buf_impl_t *db, dmu_tx_t *tx); static void dbuf_write(dbuf_dirty_record_t *dr, arc_buf_t *data, dmu_tx_t *tx); -#ifndef __lint extern inline void dmu_buf_init_user(dmu_buf_user_t *dbu, dmu_buf_evict_func_t *evict_func_sync, dmu_buf_evict_func_t *evict_func_async, dmu_buf_t **clear_on_evict_dbufp); -#endif /* ! __lint */ /* * Global data structures and functions for the dbuf cache.