Commit 76f011f7 authored by Dave Chinner's avatar Dave Chinner Committed by Chandan Babu R
Browse files

xfs: fix sparse warnings about unused interval tree functions 



Sparse throws warnings about the interval tree functions that are
defined and then not used in the scrub bitmap code:

fs/xfs/scrub/bitmap.c:57:1: warning: unused function 'xbitmap64_tree_iter_next' [-Wunused-function]
INTERVAL_TREE_DEFINE(struct xbitmap64_node, bn_rbnode, uint64_t,
^
./include/linux/interval_tree_generic.h:151:33: note: expanded from macro 'INTERVAL_TREE_DEFINE'
ITSTATIC ITSTRUCT *                                                           \
                                                                              ^
<scratch space>:3:1: note: expanded from here
xbitmap64_tree_iter_next
^
fs/xfs/scrub/bitmap.c:331:1: warning: unused function 'xbitmap32_tree_iter_next' [-Wunused-function]
INTERVAL_TREE_DEFINE(struct xbitmap32_node, bn_rbnode, uint32_t,
^
./include/linux/interval_tree_generic.h:151:33: note: expanded from macro 'INTERVAL_TREE_DEFINE'
ITSTATIC ITSTRUCT *                                                           \
                                                                              ^
<scratch space>:59:1: note: expanded from here
xbitmap32_tree_iter_next

Fix these by marking the functions created by the interval tree
creation macro as __maybe_unused to suppress this warning.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatar"Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandanbabu@kernel.org>
parent 27a7a9d9

fs/xfs/scrub/bitmap.c

+12 −10
Original line number Diff line number Diff line
@@ -40,22 +40,23 @@ struct xbitmap64_node { 
 * These functions are defined by the INTERVAL_TREE_DEFINE macro, but we'll

 * forward-declare them anyway for clarity.

 */

static inline void

static inline __maybe_unused void

xbitmap64_tree_insert(struct xbitmap64_node *node, struct rb_root_cached *root);



static inline void

static inline __maybe_unused void

xbitmap64_tree_remove(struct xbitmap64_node *node, struct rb_root_cached *root);



static inline struct xbitmap64_node *

static inline __maybe_unused struct xbitmap64_node *

xbitmap64_tree_iter_first(struct rb_root_cached *root, uint64_t start,

			uint64_t last);



static inline struct xbitmap64_node *

static inline __maybe_unused struct xbitmap64_node *

xbitmap64_tree_iter_next(struct xbitmap64_node *node, uint64_t start,

		       uint64_t last);



INTERVAL_TREE_DEFINE(struct xbitmap64_node, bn_rbnode, uint64_t,

		__bn_subtree_last, START, LAST, static inline, xbitmap64_tree)

		__bn_subtree_last, START, LAST, static inline __maybe_unused,

		xbitmap64_tree)



/* Iterate each interval of a bitmap.  Do not change the bitmap. */

#define for_each_xbitmap64_extent(bn, bitmap) \
@@ -314,22 +315,23 @@ struct xbitmap32_node { 
 * These functions are defined by the INTERVAL_TREE_DEFINE macro, but we'll

 * forward-declare them anyway for clarity.

 */

static inline void

static inline __maybe_unused void

xbitmap32_tree_insert(struct xbitmap32_node *node, struct rb_root_cached *root);



static inline void

static inline __maybe_unused void

xbitmap32_tree_remove(struct xbitmap32_node *node, struct rb_root_cached *root);



static inline struct xbitmap32_node *

static inline __maybe_unused struct xbitmap32_node *

xbitmap32_tree_iter_first(struct rb_root_cached *root, uint32_t start,

			  uint32_t last);



static inline struct xbitmap32_node *

static inline __maybe_unused struct xbitmap32_node *

xbitmap32_tree_iter_next(struct xbitmap32_node *node, uint32_t start,

			 uint32_t last);



INTERVAL_TREE_DEFINE(struct xbitmap32_node, bn_rbnode, uint32_t,

		__bn_subtree_last, START, LAST, static inline, xbitmap32_tree)

		__bn_subtree_last, START, LAST, static inline __maybe_unused,

		xbitmap32_tree)



/* Iterate each interval of a bitmap.  Do not change the bitmap. */

#define for_each_xbitmap32_extent(bn, bitmap) \