iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rds: make local functions/variables static

Browse Source 
The RDS protocol has lots of functions that should be
declared static. rds_message_get/add_version_extension is
removed since it defined but never used.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
stephen hemminger 2010-10-19 08:08:33 +00:00 committed by David S. Miller
parent d0c2b0d265
commit ff51bf8415
20 changed files with 29 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/rds/connection.c
View File

@ -88,7 +88,7 @@ static struct rds_connection *rds_conn_lookup(struct hlist_head *head,
* and receiving over this connection again in the future. It is up to * and receiving over this connection again in the future. It is up to
* the transport to have serialized this call with its send and recv. * the transport to have serialized this call with its send and recv.
*/ */
void rds_conn_reset(struct rds_connection *conn) static void rds_conn_reset(struct rds_connection *conn)
{ {
rdsdebug("connection %pI4 to %pI4 reset\n", rdsdebug("connection %pI4 to %pI4 reset\n",
&conn->c_laddr, &conn->c_faddr); &conn->c_laddr, &conn->c_faddr);

10
net/rds/ib.c
View File

@ -42,7 +42,7 @@
#include "rds.h" #include "rds.h"
#include "ib.h" #include "ib.h"
unsigned int fmr_pool_size = RDS_FMR_POOL_SIZE; static unsigned int fmr_pool_size = RDS_FMR_POOL_SIZE;
unsigned int fmr_message_size = RDS_FMR_SIZE + 1; /* +1 allows for unaligned MRs */ unsigned int fmr_message_size = RDS_FMR_SIZE + 1; /* +1 allows for unaligned MRs */
unsigned int rds_ib_retry_count = RDS_IB_DEFAULT_RETRY_COUNT; unsigned int rds_ib_retry_count = RDS_IB_DEFAULT_RETRY_COUNT;
@ -65,7 +65,7 @@ struct list_head rds_ib_devices;
DEFINE_SPINLOCK(ib_nodev_conns_lock); DEFINE_SPINLOCK(ib_nodev_conns_lock);
LIST_HEAD(ib_nodev_conns); LIST_HEAD(ib_nodev_conns);
void rds_ib_nodev_connect(void) static void rds_ib_nodev_connect(void)
{ {
struct rds_ib_connection *ic; struct rds_ib_connection *ic;
@ -75,7 +75,7 @@ void rds_ib_nodev_connect(void)
spin_unlock(&ib_nodev_conns_lock); spin_unlock(&ib_nodev_conns_lock);
} }
void rds_ib_dev_shutdown(struct rds_ib_device *rds_ibdev) static void rds_ib_dev_shutdown(struct rds_ib_device *rds_ibdev)
{ {
struct rds_ib_connection *ic; struct rds_ib_connection *ic;
unsigned long flags; unsigned long flags;
@ -118,7 +118,7 @@ void rds_ib_dev_put(struct rds_ib_device *rds_ibdev)
queue_work(rds_wq, &rds_ibdev->free_work); queue_work(rds_wq, &rds_ibdev->free_work);
} }
void rds_ib_add_one(struct ib_device *device) static void rds_ib_add_one(struct ib_device *device)
{ {
struct rds_ib_device *rds_ibdev; struct rds_ib_device *rds_ibdev;
struct ib_device_attr *dev_attr; struct ib_device_attr *dev_attr;
@ -229,7 +229,7 @@ struct rds_ib_device *rds_ib_get_client_data(struct ib_device *device)
* *
* This can be called at any time and can be racing with any other RDS path. * This can be called at any time and can be racing with any other RDS path.
*/ */
void rds_ib_remove_one(struct ib_device *device) static void rds_ib_remove_one(struct ib_device *device)
{ {
struct rds_ib_device *rds_ibdev; struct rds_ib_device *rds_ibdev;

4
net/rds/ib.h
View File

@ -265,13 +265,10 @@ static inline void rds_ib_dma_sync_sg_for_device(struct ib_device *dev,
/* ib.c */ /* ib.c */
extern struct rds_transport rds_ib_transport; extern struct rds_transport rds_ib_transport;
extern void rds_ib_add_one(struct ib_device *device);
extern void rds_ib_remove_one(struct ib_device *device);
struct rds_ib_device *rds_ib_get_client_data(struct ib_device *device); struct rds_ib_device *rds_ib_get_client_data(struct ib_device *device);
void rds_ib_dev_put(struct rds_ib_device *rds_ibdev); void rds_ib_dev_put(struct rds_ib_device *rds_ibdev);
extern struct ib_client rds_ib_client; extern struct ib_client rds_ib_client;
extern unsigned int fmr_pool_size;
extern unsigned int fmr_message_size; extern unsigned int fmr_message_size;
extern unsigned int rds_ib_retry_count; extern unsigned int rds_ib_retry_count;
@ -374,6 +371,5 @@ extern unsigned long rds_ib_sysctl_max_unsig_wrs;
extern unsigned long rds_ib_sysctl_max_unsig_bytes; extern unsigned long rds_ib_sysctl_max_unsig_bytes;
extern unsigned long rds_ib_sysctl_max_recv_allocation; extern unsigned long rds_ib_sysctl_max_recv_allocation;
extern unsigned int rds_ib_sysctl_flow_control; extern unsigned int rds_ib_sysctl_flow_control;
extern ctl_table rds_ib_sysctl_table[];
#endif #endif

2
net/rds/ib_rdma.c
View File

@ -38,7 +38,7 @@
#include "ib.h" #include "ib.h"
#include "xlist.h" #include "xlist.h"
struct workqueue_struct *rds_ib_fmr_wq; static struct workqueue_struct *rds_ib_fmr_wq;
static DEFINE_PER_CPU(unsigned long, clean_list_grace); static DEFINE_PER_CPU(unsigned long, clean_list_grace);
#define CLEAN_LIST_BUSY_BIT 0 #define CLEAN_LIST_BUSY_BIT 0

2
net/rds/ib_sysctl.c
View File

@ -61,7 +61,7 @@ static unsigned long rds_ib_sysctl_max_unsig_wr_max = 64;
*/ */
unsigned int rds_ib_sysctl_flow_control = 0; unsigned int rds_ib_sysctl_flow_control = 0;
ctl_table rds_ib_sysctl_table[] = { static ctl_table rds_ib_sysctl_table[] = {
{ {
.procname = "max_send_wr", .procname = "max_send_wr",
.data = &rds_ib_sysctl_max_send_wr, .data = &rds_ib_sysctl_max_send_wr,

4
net/rds/iw.c
View File

@ -56,7 +56,7 @@ struct list_head rds_iw_devices;
DEFINE_SPINLOCK(iw_nodev_conns_lock); DEFINE_SPINLOCK(iw_nodev_conns_lock);
LIST_HEAD(iw_nodev_conns); LIST_HEAD(iw_nodev_conns);
void rds_iw_add_one(struct ib_device *device) static void rds_iw_add_one(struct ib_device *device)
{ {
struct rds_iw_device *rds_iwdev; struct rds_iw_device *rds_iwdev;
struct ib_device_attr *dev_attr; struct ib_device_attr *dev_attr;
@ -124,7 +124,7 @@ free_attr:
kfree(dev_attr); kfree(dev_attr);
} }
void rds_iw_remove_one(struct ib_device *device) static void rds_iw_remove_one(struct ib_device *device)
{ {
struct rds_iw_device *rds_iwdev; struct rds_iw_device *rds_iwdev;
struct rds_iw_cm_id *i_cm_id, *next; struct rds_iw_cm_id *i_cm_id, *next;

4
net/rds/iw.h
View File

@ -268,8 +268,6 @@ static inline u32 rds_iw_local_dma_lkey(struct rds_iw_connection *ic)
/* ib.c */ /* ib.c */
extern struct rds_transport rds_iw_transport; extern struct rds_transport rds_iw_transport;
extern void rds_iw_add_one(struct ib_device *device);
extern void rds_iw_remove_one(struct ib_device *device);
extern struct ib_client rds_iw_client; extern struct ib_client rds_iw_client;
extern unsigned int fastreg_pool_size; extern unsigned int fastreg_pool_size;
@ -318,7 +316,6 @@ void *rds_iw_get_mr(struct scatterlist *sg, unsigned long nents,
void rds_iw_sync_mr(void *trans_private, int dir); void rds_iw_sync_mr(void *trans_private, int dir);
void rds_iw_free_mr(void *trans_private, int invalidate); void rds_iw_free_mr(void *trans_private, int invalidate);
void rds_iw_flush_mrs(void); void rds_iw_flush_mrs(void);
void rds_iw_remove_cm_id(struct rds_iw_device *rds_iwdev, struct rdma_cm_id *cm_id);
/* ib_recv.c */ /* ib_recv.c */
int rds_iw_recv_init(void); int rds_iw_recv_init(void);
@ -378,7 +375,6 @@ extern unsigned long rds_iw_sysctl_max_unsig_wrs;
extern unsigned long rds_iw_sysctl_max_unsig_bytes; extern unsigned long rds_iw_sysctl_max_unsig_bytes;
extern unsigned long rds_iw_sysctl_max_recv_allocation; extern unsigned long rds_iw_sysctl_max_recv_allocation;
extern unsigned int rds_iw_sysctl_flow_control; extern unsigned int rds_iw_sysctl_flow_control;
extern ctl_table rds_iw_sysctl_table[];
/* /*
* Helper functions for getting/setting the header and data SGEs in * Helper functions for getting/setting the header and data SGEs in

3
net/rds/iw_rdma.c
View File

@ -157,7 +157,8 @@ static int rds_iw_add_cm_id(struct rds_iw_device *rds_iwdev, struct rdma_cm_id *
return 0; return 0;
} }
void rds_iw_remove_cm_id(struct rds_iw_device *rds_iwdev, struct rdma_cm_id *cm_id) static void rds_iw_remove_cm_id(struct rds_iw_device *rds_iwdev,
struct rdma_cm_id *cm_id)
{ {
struct rds_iw_cm_id *i_cm_id; struct rds_iw_cm_id *i_cm_id;

2
net/rds/iw_sysctl.c
View File

@ -55,7 +55,7 @@ static unsigned long rds_iw_sysctl_max_unsig_bytes_max = ~0UL;
unsigned int rds_iw_sysctl_flow_control = 1; unsigned int rds_iw_sysctl_flow_control = 1;
ctl_table rds_iw_sysctl_table[] = { static ctl_table rds_iw_sysctl_table[] = {
{ {
.procname = "max_send_wr", .procname = "max_send_wr",
.data = &rds_iw_sysctl_max_send_wr, .data = &rds_iw_sysctl_max_send_wr,

24
net/rds/message.c
View File

@ -106,8 +106,8 @@ void rds_message_populate_header(struct rds_header *hdr, __be16 sport,
} }
EXPORT_SYMBOL_GPL(rds_message_populate_header); EXPORT_SYMBOL_GPL(rds_message_populate_header);
int rds_message_add_extension(struct rds_header *hdr, int rds_message_add_extension(struct rds_header *hdr, unsigned int type,
unsigned int type, const void *data, unsigned int len) const void *data, unsigned int len)
{ {
unsigned int ext_len = sizeof(u8) + len; unsigned int ext_len = sizeof(u8) + len;
unsigned char *dst; unsigned char *dst;
@ -177,26 +177,6 @@ none:
return RDS_EXTHDR_NONE; return RDS_EXTHDR_NONE;
} }
int rds_message_add_version_extension(struct rds_header *hdr, unsigned int version)
{
struct rds_ext_header_version ext_hdr;
ext_hdr.h_version = cpu_to_be32(version);
return rds_message_add_extension(hdr, RDS_EXTHDR_VERSION, &ext_hdr, sizeof(ext_hdr));
}
int rds_message_get_version_extension(struct rds_header *hdr, unsigned int *version)
{
struct rds_ext_header_version ext_hdr;
unsigned int pos = 0, len = sizeof(ext_hdr);
/* We assume the version extension is the only one present */
if (rds_message_next_extension(hdr, &pos, &ext_hdr, &len) != RDS_EXTHDR_VERSION)
return 0;
*version = be32_to_cpu(ext_hdr.h_version);
return 1;
}
int rds_message_add_rdma_dest_extension(struct rds_header *hdr, u32 r_key, u32 offset) int rds_message_add_rdma_dest_extension(struct rds_header *hdr, u32 r_key, u32 offset)
{ {
struct rds_ext_header_rdma_dest ext_hdr; struct rds_ext_header_rdma_dest ext_hdr;

3
net/rds/page.c
View File

@ -40,7 +40,8 @@ struct rds_page_remainder {
unsigned long r_offset; unsigned long r_offset;
}; };
DEFINE_PER_CPU_SHARED_ALIGNED(struct rds_page_remainder, rds_page_remainders); static DEFINE_PER_CPU_SHARED_ALIGNED(struct rds_page_remainder,
rds_page_remainders);
/* /*
* returns 0 on success or -errno on failure. * returns 0 on success or -errno on failure.

4
net/rds/rdma_transport.c
View File

@ -207,7 +207,7 @@ static void rds_rdma_listen_stop(void)
} }
} }
int rds_rdma_init(void) static int rds_rdma_init(void)
{ {
int ret; int ret;
@ -234,7 +234,7 @@ out:
} }
module_init(rds_rdma_init); module_init(rds_rdma_init);
void rds_rdma_exit(void) static void rds_rdma_exit(void)
{ {
/* stop listening first to ensure no new connections are attempted */ /* stop listening first to ensure no new connections are attempted */
rds_rdma_listen_stop(); rds_rdma_listen_stop();

4
net/rds/rdma_transport.h
View File

@ -11,10 +11,6 @@ int rds_rdma_conn_connect(struct rds_connection *conn);
int rds_rdma_cm_event_handler(struct rdma_cm_id *cm_id, int rds_rdma_cm_event_handler(struct rdma_cm_id *cm_id,
struct rdma_cm_event *event); struct rdma_cm_event *event);
/* from rdma_transport.c */
int rds_rdma_init(void);
void rds_rdma_exit(void);
/* from ib.c */ /* from ib.c */
extern struct rds_transport rds_ib_transport; extern struct rds_transport rds_ib_transport;
int rds_ib_init(void); int rds_ib_init(void);

5
net/rds/rds.h
View File

@ -619,7 +619,6 @@ struct rds_connection *rds_conn_create_outgoing(__be32 laddr, __be32 faddr,
struct rds_transport *trans, gfp_t gfp); struct rds_transport *trans, gfp_t gfp);
void rds_conn_shutdown(struct rds_connection *conn); void rds_conn_shutdown(struct rds_connection *conn);
void rds_conn_destroy(struct rds_connection *conn); void rds_conn_destroy(struct rds_connection *conn);
void rds_conn_reset(struct rds_connection *conn);
void rds_conn_drop(struct rds_connection *conn); void rds_conn_drop(struct rds_connection *conn);
void rds_conn_connect_if_down(struct rds_connection *conn); void rds_conn_connect_if_down(struct rds_connection *conn);
void rds_for_each_conn_info(struct socket *sock, unsigned int len, void rds_for_each_conn_info(struct socket *sock, unsigned int len,
@ -668,8 +667,6 @@ int rds_message_add_extension(struct rds_header *hdr,
unsigned int type, const void *data, unsigned int len); unsigned int type, const void *data, unsigned int len);
int rds_message_next_extension(struct rds_header *hdr, int rds_message_next_extension(struct rds_header *hdr,
unsigned int *pos, void *buf, unsigned int *buflen); unsigned int *pos, void *buf, unsigned int *buflen);
int rds_message_add_version_extension(struct rds_header *hdr, unsigned int version);
int rds_message_get_version_extension(struct rds_header *hdr, unsigned int *version);
int rds_message_add_rdma_dest_extension(struct rds_header *hdr, u32 r_key, u32 offset); int rds_message_add_rdma_dest_extension(struct rds_header *hdr, u32 r_key, u32 offset);
int rds_message_inc_copy_to_user(struct rds_incoming *inc, int rds_message_inc_copy_to_user(struct rds_incoming *inc,
struct iovec *first_iov, size_t size); struct iovec *first_iov, size_t size);
@ -706,7 +703,6 @@ void rds_page_exit(void);
/* recv.c */ /* recv.c */
void rds_inc_init(struct rds_incoming *inc, struct rds_connection *conn, void rds_inc_init(struct rds_incoming *inc, struct rds_connection *conn,
__be32 saddr); __be32 saddr);
void rds_inc_addref(struct rds_incoming *inc);
void rds_inc_put(struct rds_incoming *inc); void rds_inc_put(struct rds_incoming *inc);
void rds_recv_incoming(struct rds_connection *conn, __be32 saddr, __be32 daddr, void rds_recv_incoming(struct rds_connection *conn, __be32 saddr, __be32 daddr,
struct rds_incoming *inc, gfp_t gfp, enum km_type km); struct rds_incoming *inc, gfp_t gfp, enum km_type km);
@ -728,7 +724,6 @@ void rds_send_drop_to(struct rds_sock *rs, struct sockaddr_in *dest);
typedef int (*is_acked_func)(struct rds_message *rm, uint64_t ack); typedef int (*is_acked_func)(struct rds_message *rm, uint64_t ack);
void rds_send_drop_acked(struct rds_connection *conn, u64 ack, void rds_send_drop_acked(struct rds_connection *conn, u64 ack,
is_acked_func is_acked); is_acked_func is_acked);
void rds_send_remove_from_sock(struct list_head *messages, int status);
int rds_send_pong(struct rds_connection *conn, __be16 dport); int rds_send_pong(struct rds_connection *conn, __be16 dport);
struct rds_message *rds_send_get_message(struct rds_connection *, struct rds_message *rds_send_get_message(struct rds_connection *,
struct rm_rdma_op *); struct rm_rdma_op *);

3
net/rds/recv.c
View File

@ -48,12 +48,11 @@ void rds_inc_init(struct rds_incoming *inc, struct rds_connection *conn,
} }
EXPORT_SYMBOL_GPL(rds_inc_init); EXPORT_SYMBOL_GPL(rds_inc_init);
void rds_inc_addref(struct rds_incoming *inc) static void rds_inc_addref(struct rds_incoming *inc)
{ {
rdsdebug("addref inc %p ref %d\n", inc, atomic_read(&inc->i_refcount)); rdsdebug("addref inc %p ref %d\n", inc, atomic_read(&inc->i_refcount));
atomic_inc(&inc->i_refcount); atomic_inc(&inc->i_refcount);
} }
EXPORT_SYMBOL_GPL(rds_inc_addref);
void rds_inc_put(struct rds_incoming *inc) void rds_inc_put(struct rds_incoming *inc)
{ {

4
net/rds/send.c
View File

@ -52,6 +52,8 @@ static int send_batch_count = 64;
module_param(send_batch_count, int, 0444); module_param(send_batch_count, int, 0444);
MODULE_PARM_DESC(send_batch_count, " batch factor when working the send queue"); MODULE_PARM_DESC(send_batch_count, " batch factor when working the send queue");
static void rds_send_remove_from_sock(struct list_head *messages, int status);
/* /*
* Reset the send state. Callers must ensure that this doesn't race with * Reset the send state. Callers must ensure that this doesn't race with
* rds_send_xmit(). * rds_send_xmit().
@ -555,7 +557,7 @@ EXPORT_SYMBOL_GPL(rds_send_get_message);
* removing the messages from the 'messages' list regardless of if it found * removing the messages from the 'messages' list regardless of if it found
* the messages on the socket list or not. * the messages on the socket list or not.
*/ */
void rds_send_remove_from_sock(struct list_head *messages, int status) static void rds_send_remove_from_sock(struct list_head *messages, int status)
{ {
unsigned long flags; unsigned long flags;
struct rds_sock *rs = NULL; struct rds_sock *rs = NULL;

6
net/rds/tcp.c
View File

@ -41,7 +41,7 @@
/* only for info exporting */ /* only for info exporting */
static DEFINE_SPINLOCK(rds_tcp_tc_list_lock); static DEFINE_SPINLOCK(rds_tcp_tc_list_lock);
static LIST_HEAD(rds_tcp_tc_list); static LIST_HEAD(rds_tcp_tc_list);
unsigned int rds_tcp_tc_count; static unsigned int rds_tcp_tc_count;
/* Track rds_tcp_connection structs so they can be cleaned up */ /* Track rds_tcp_connection structs so they can be cleaned up */
static DEFINE_SPINLOCK(rds_tcp_conn_lock); static DEFINE_SPINLOCK(rds_tcp_conn_lock);
@ -243,7 +243,7 @@ static void rds_tcp_destroy_conns(void)
} }
} }
void rds_tcp_exit(void) static void rds_tcp_exit(void)
{ {
rds_info_deregister_func(RDS_INFO_TCP_SOCKETS, rds_tcp_tc_info); rds_info_deregister_func(RDS_INFO_TCP_SOCKETS, rds_tcp_tc_info);
rds_tcp_listen_stop(); rds_tcp_listen_stop();
@ -274,7 +274,7 @@ struct rds_transport rds_tcp_transport = {
.t_prefer_loopback = 1, .t_prefer_loopback = 1,
}; };
int rds_tcp_init(void) static int rds_tcp_init(void)
{ {
int ret; int ret;

2
net/rds/tcp.h
View File

@ -43,8 +43,6 @@ struct rds_tcp_statistics {
}; };
/* tcp.c */ /* tcp.c */
int rds_tcp_init(void);
void rds_tcp_exit(void);
void rds_tcp_tune(struct socket *sock); void rds_tcp_tune(struct socket *sock);
void rds_tcp_nonagle(struct socket *sock); void rds_tcp_nonagle(struct socket *sock);
void rds_tcp_set_callbacks(struct socket *sock, struct rds_connection *conn); void rds_tcp_set_callbacks(struct socket *sock, struct rds_connection *conn);

3
net/rds/tcp_recv.c
View File

@ -272,7 +272,8 @@ out:
} }
/* the caller has to hold the sock lock */ /* the caller has to hold the sock lock */
int rds_tcp_read_sock(struct rds_connection *conn, gfp_t gfp, enum km_type km) static int rds_tcp_read_sock(struct rds_connection *conn, gfp_t gfp,
enum km_type km)
{ {
struct rds_tcp_connection *tc = conn->c_transport_data; struct rds_tcp_connection *tc = conn->c_transport_data;
struct socket *sock = tc->t_sock; struct socket *sock = tc->t_sock;

2
net/rds/tcp_send.c
View File

@ -63,7 +63,7 @@ void rds_tcp_xmit_complete(struct rds_connection *conn)
} }
/* the core send_sem serializes this with other xmit and shutdown */ /* the core send_sem serializes this with other xmit and shutdown */
int rds_tcp_sendmsg(struct socket *sock, void *data, unsigned int len) static int rds_tcp_sendmsg(struct socket *sock, void *data, unsigned int len)
{ {
struct kvec vec = { struct kvec vec = {
.iov_base = data, .iov_base = data,