page_pool: fix compile warning when CONFIG_PAGE_POOL is disabled
authorJesper Dangaard Brouer <brouer@redhat.com>
Wed, 19 Jun 2019 22:15:52 +0000 (00:15 +0200)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Jun 2019 01:26:06 +0000 (21:26 -0400)
Kbuild test robot reported compile warning:
 warning: no return statement in function returning non-void
in function page_pool_request_shutdown, when CONFIG_PAGE_POOL is disabled.

The fix makes the code a little more verbose, with a descriptive variable.

Fixes: 99c07c43c4ea ("xdp: tracking page_pool resources and safe removal")
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/page_pool.h

index f09b3f1994e603a6ef871fd35299a21e9f20160c..f07c518ef8a5297ee97b7b10dfbb9ce0de013063 100644 (file)
@@ -156,12 +156,12 @@ static inline void page_pool_recycle_direct(struct page_pool *pool,
 bool __page_pool_request_shutdown(struct page_pool *pool);
 static inline bool page_pool_request_shutdown(struct page_pool *pool)
 {
-       /* When page_pool isn't compiled-in, net/core/xdp.c doesn't
-        * allow registering MEM_TYPE_PAGE_POOL, but shield linker.
-        */
+       bool safe_to_remove = false;
+
 #ifdef CONFIG_PAGE_POOL
-       return __page_pool_request_shutdown(pool);
+       safe_to_remove = __page_pool_request_shutdown(pool);
 #endif
+       return safe_to_remove;
 }
 
 /* Disconnects a page (from a page_pool).  API users can have a need