OSDN Git Service

RDMA/umem: Avoid partial declaration of non-static function
authorLeon Romanovsky <leonro@mellanox.com>
Wed, 25 Oct 2017 15:56:49 +0000 (18:56 +0300)
committerDoug Ledford <dledford@redhat.com>
Fri, 10 Nov 2017 18:02:12 +0000 (13:02 -0500)
commitfec99ededf6be46178d7f571b34dae80fc05f090
treec6f54a6366e06b816519f70fdaf993ee7f402d04
parent26beb85f4168dba76a197883065398a55ce11cf4
RDMA/umem: Avoid partial declaration of non-static function

The RDMA/umem uses generic RB-trees macros to generate various ib_umem
access functions. The generation is performed with INTERVAL_TREE_DEFINE
macro, which allows one of two modes: declare all functions as static or
declare none of the function to be static.

The second mode of operation produces the following sparse errors:
 drivers/infiniband/core/umem_rbtree.c:69:1:
warning: symbol 'rbt_ib_umem_iter_first' was not declared.
Should it be static?
 drivers/infiniband/core/umem_rbtree.c:69:1:
warning: symbol 'rbt_ib_umem_iter_next' was not declared.
Should it be static?

Code relocation together with declaration of such functions to be
"static" solves the issue.

Because there is no need to have separate file for two functions,
let's consolidate umem_rtree.c and umem_odp.c into one file.

Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/core/Makefile
drivers/infiniband/core/umem_odp.c
drivers/infiniband/core/umem_rbtree.c [deleted file]
include/rdma/ib_umem_odp.h