diff options
Diffstat (limited to 'drivers/staging/lustre/lnet')
19 files changed, 266 insertions, 322 deletions
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c index ab164394349..8f5cdd584f8 100644 --- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c +++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c @@ -1025,7 +1025,7 @@ kiblnd_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg) struct libcfs_ioctl_data *data = arg; int rc = -EINVAL; - switch(cmd) { + switch (cmd) { case IOC_LIBCFS_GET_PEER: { lnet_nid_t nid = 0; int count = 0; @@ -1202,7 +1202,7 @@ kiblnd_map_rx_descs(kib_conn_t *conn) rx->rx_msgaddr)); KIBLND_UNMAP_ADDR_SET(rx, rx_msgunmap, rx->rx_msgaddr); - CDEBUG(D_NET,"rx %d: %p %#llx(%#llx)\n", + CDEBUG(D_NET, "rx %d: %p %#llx(%#llx)\n", i, rx->rx_msg, rx->rx_msgaddr, lnet_page2phys(pg) + pg_off); diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h index 4306d9804a1..b02b4ec1e29 100644 --- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h +++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h @@ -79,8 +79,7 @@ #define IBLND_N_SCHED 2 #define IBLND_N_SCHED_HIGH 4 -typedef struct -{ +typedef struct { int *kib_dev_failover; /* HCA failover */ unsigned int *kib_service; /* IB service number */ int *kib_min_reconnect_interval; /* first failed connection retry... */ @@ -186,8 +185,7 @@ struct kib_hca_dev; #define KIB_IFNAME_SIZE 256 #endif -typedef struct -{ +typedef struct { struct list_head ibd_list; /* chain on kib_devs */ struct list_head ibd_fail_list; /* chain on kib_failed_devs */ __u32 ibd_ifip; /* IPoIB interface IP */ @@ -203,8 +201,7 @@ typedef struct struct kib_hca_dev *ibd_hdev; } kib_dev_t; -typedef struct kib_hca_dev -{ +typedef struct kib_hca_dev { struct rdma_cm_id *ibh_cmid; /* listener cmid */ struct ib_device *ibh_ibdev; /* IB device */ int ibh_page_shift; /* page shift of current HCA */ @@ -224,8 +221,7 @@ typedef struct kib_hca_dev /** # of seconds to retry if allocation failed */ #define IBLND_POOL_RETRY 1 -typedef struct -{ +typedef struct { int ibp_npages; /* # pages */ struct page *ibp_pages[0]; /* page array */ } kib_pages_t; @@ -254,8 +250,7 @@ struct kib_net; #define IBLND_POOL_NAME_LEN 32 -typedef struct kib_poolset -{ +typedef struct kib_poolset { spinlock_t ps_lock; /* serialize */ struct kib_net *ps_net; /* network it belongs to */ char ps_name[IBLND_POOL_NAME_LEN]; /* pool set name */ @@ -272,8 +267,7 @@ typedef struct kib_poolset kib_ps_node_fini_t ps_node_fini; /* finalize node */ } kib_poolset_t; -typedef struct kib_pool -{ +typedef struct kib_pool { struct list_head po_list; /* chain on pool list */ struct list_head po_free_list; /* pre-allocated node */ kib_poolset_t *po_owner; /* pool_set of this pool */ @@ -304,8 +298,7 @@ typedef struct kib_pmr_pool { kib_pool_t ppo_pool; /* pool */ } kib_pmr_pool_t; -typedef struct -{ +typedef struct { spinlock_t fps_lock; /* serialize */ struct kib_net *fps_net; /* IB network */ struct list_head fps_pool_list; /* FMR pool list */ @@ -320,8 +313,7 @@ typedef struct unsigned long fps_next_retry; } kib_fmr_poolset_t; -typedef struct -{ +typedef struct { struct list_head fpo_list; /* chain on pool list */ struct kib_hca_dev *fpo_hdev; /* device for this pool */ kib_fmr_poolset_t *fpo_owner; /* owner of this pool */ @@ -336,8 +328,7 @@ typedef struct { kib_fmr_pool_t *fmr_pool; /* pool of FMR */ } kib_fmr_t; -typedef struct kib_net -{ +typedef struct kib_net { struct list_head ibn_list; /* chain on kib_dev_t::ibd_nets */ __u64 ibn_incarnation; /* my epoch */ int ibn_init; /* initialisation state */ @@ -372,8 +363,7 @@ struct kib_sched_info { int ibs_cpt; /* CPT id */ }; -typedef struct -{ +typedef struct { int kib_init; /* initialisation state */ int kib_shutdown; /* shut down? */ struct list_head kib_devs; /* IB devices extant */ @@ -411,60 +401,51 @@ typedef struct * These are sent in sender's byte order (i.e. receiver flips). */ -typedef struct kib_connparams -{ +typedef struct kib_connparams { __u16 ibcp_queue_depth; __u16 ibcp_max_frags; __u32 ibcp_max_msg_size; } WIRE_ATTR kib_connparams_t; -typedef struct -{ +typedef struct { lnet_hdr_t ibim_hdr; /* portals header */ char ibim_payload[0]; /* piggy-backed payload */ } WIRE_ATTR kib_immediate_msg_t; -typedef struct -{ +typedef struct { __u32 rf_nob; /* # bytes this frag */ __u64 rf_addr; /* CAVEAT EMPTOR: misaligned!! */ } WIRE_ATTR kib_rdma_frag_t; -typedef struct -{ +typedef struct { __u32 rd_key; /* local/remote key */ __u32 rd_nfrags; /* # fragments */ kib_rdma_frag_t rd_frags[0]; /* buffer frags */ } WIRE_ATTR kib_rdma_desc_t; -typedef struct -{ +typedef struct { lnet_hdr_t ibprm_hdr; /* portals header */ __u64 ibprm_cookie; /* opaque completion cookie */ } WIRE_ATTR kib_putreq_msg_t; -typedef struct -{ +typedef struct { __u64 ibpam_src_cookie; /* reflected completion cookie */ __u64 ibpam_dst_cookie; /* opaque completion cookie */ kib_rdma_desc_t ibpam_rd; /* sender's sink buffer */ } WIRE_ATTR kib_putack_msg_t; -typedef struct -{ +typedef struct { lnet_hdr_t ibgm_hdr; /* portals header */ __u64 ibgm_cookie; /* opaque completion cookie */ kib_rdma_desc_t ibgm_rd; /* rdma descriptor */ } WIRE_ATTR kib_get_msg_t; -typedef struct -{ +typedef struct { __u64 ibcm_cookie; /* opaque completion cookie */ __s32 ibcm_status; /* < 0 failure: >= 0 length */ } WIRE_ATTR kib_completion_msg_t; -typedef struct -{ +typedef struct { /* First 2 fields fixed FOR ALL TIME */ __u32 ibm_magic; /* I'm an ibnal message */ __u16 ibm_version; /* this is my version number */ @@ -574,14 +555,12 @@ typedef struct kib_tx /* transmit message */ int tx_dmadir; /* dma direction */ } kib_tx_t; -typedef struct kib_connvars -{ +typedef struct kib_connvars { /* connection-in-progress variables */ kib_msg_t cv_msg; } kib_connvars_t; -typedef struct kib_conn -{ +typedef struct kib_conn { struct kib_sched_info *ibc_sched; /* scheduler information */ struct kib_peer *ibc_peer; /* owning peer */ kib_hca_dev_t *ibc_hdev; /* HCA bound on */ @@ -629,8 +608,7 @@ typedef struct kib_conn #define IBLND_CONN_CLOSING 4 /* being closed */ #define IBLND_CONN_DISCONNECTED 5 /* disconnected */ -typedef struct kib_peer -{ +typedef struct kib_peer { struct list_head ibp_list; /* stash on global peer list */ lnet_nid_t ibp_nid; /* who's on the other end(s) */ lnet_ni_t *ibp_ni; /* LNet interface */ diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c index 306d7287643..14c9c8d18d0 100644 --- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c +++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c @@ -1487,7 +1487,7 @@ kiblnd_send (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg) switch (type) { default: LBUG(); - return (-EIO); + return -EIO; case LNET_MSG_ACK: LASSERT (payload_nob == 0); @@ -2080,7 +2080,7 @@ kiblnd_connreq_done(kib_conn_t *conn, int status) active = (conn->ibc_state == IBLND_CONN_ACTIVE_CONNECT); - CDEBUG(D_NET,"%s: active(%d), version(%x), status(%d)\n", + CDEBUG(D_NET, "%s: active(%d), version(%x), status(%d)\n", libcfs_nid2str(peer->ibp_nid), active, conn->ibc_version, status); @@ -2848,7 +2848,7 @@ kiblnd_cm_callback(struct rdma_cm_id *cmid, struct rdma_cm_event *event) case RDMA_CM_EVENT_ADDR_RESOLVED: peer = (kib_peer_t *)cmid->context; - CDEBUG(D_NET,"%s Addr resolved: %d\n", + CDEBUG(D_NET, "%s Addr resolved: %d\n", libcfs_nid2str(peer->ibp_nid), event->status); if (event->status != 0) { @@ -2878,7 +2878,7 @@ kiblnd_cm_callback(struct rdma_cm_id *cmid, struct rdma_cm_event *event) case RDMA_CM_EVENT_ROUTE_RESOLVED: peer = (kib_peer_t *)cmid->context; - CDEBUG(D_NET,"%s Route resolved: %d\n", + CDEBUG(D_NET, "%s Route resolved: %d\n", libcfs_nid2str(peer->ibp_nid), event->status); if (event->status == 0) @@ -3215,7 +3215,6 @@ kiblnd_connd (void *arg) schedule_timeout(timeout); - set_current_state(TASK_RUNNING); remove_wait_queue(&kiblnd_data.kib_connd_waitq, &wait); spin_lock_irqsave(&kiblnd_data.kib_connd_lock, flags); } @@ -3432,7 +3431,6 @@ kiblnd_scheduler(void *arg) busy_loops = 0; remove_wait_queue(&sched->ibs_waitq, &wait); - set_current_state(TASK_RUNNING); spin_lock_irqsave(&sched->ibs_lock, flags); } @@ -3507,7 +3505,6 @@ kiblnd_failover_thread(void *arg) rc = schedule_timeout(long_sleep ? cfs_time_seconds(10) : cfs_time_seconds(1)); - set_current_state(TASK_RUNNING); remove_wait_queue(&kiblnd_data.kib_failover_waitq, &wait); write_lock_irqsave(glock, flags); diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h index f7cce9d9b7b..a29d4da6e34 100644 --- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h +++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h @@ -93,8 +93,7 @@ typedef struct /* in-use interface */ char ksni_name[IFNAMSIZ]; /* interface name */ } ksock_interface_t; -typedef struct -{ +typedef struct { /* "stuck" socket timeout (seconds) */ int *ksnd_timeout; /* # scheduler threads in each pool while starting */ @@ -126,8 +125,7 @@ typedef struct int *ksnd_zc_recv_min_nfrags; /* minimum # of fragments to enable ZC receive */ } ksock_tunables_t; -typedef struct -{ +typedef struct { __u64 ksnn_incarnation; /* my epoch */ spinlock_t ksnn_lock; /* serialise */ struct list_head ksnn_list; /* chain on global list */ @@ -142,8 +140,7 @@ typedef struct /** reserved thread for accepting & creating new connd */ #define SOCKNAL_CONND_RESV 1 -typedef struct -{ +typedef struct { int ksnd_init; /* initialisation state */ int ksnd_nnets; /* # networks set up */ struct list_head ksnd_nets; /* list of nets */ @@ -257,8 +254,7 @@ typedef union { #define SOCKNAL_RX_LNET_PAYLOAD 5 /* reading lnet payload (to deliver here) */ #define SOCKNAL_RX_SLOP 6 /* skipping body */ -typedef struct ksock_conn -{ +typedef struct ksock_conn { struct ksock_peer *ksnc_peer; /* owning peer */ struct ksock_route *ksnc_route; /* owning route */ struct list_head ksnc_list; /* stash on peer's conn list */ @@ -313,8 +309,7 @@ typedef struct ksock_conn unsigned long ksnc_tx_last_post; /* time stamp of the last posted TX */ } ksock_conn_t; -typedef struct ksock_route -{ +typedef struct ksock_route { struct list_head ksnr_list; /* chain on peer route list */ struct list_head ksnr_connd_list; /* chain on ksnr_connd_routes */ struct ksock_peer *ksnr_peer; /* owning peer */ @@ -334,8 +329,7 @@ typedef struct ksock_route #define SOCKNAL_KEEPALIVE_PING 1 /* cookie for keepalive ping */ -typedef struct ksock_peer -{ +typedef struct ksock_peer { struct list_head ksnp_list; /* stash on global peer list */ unsigned long ksnp_last_alive; /* when (in jiffies) I was last alive */ lnet_process_id_t ksnp_id; /* who's on the other end(s) */ @@ -358,8 +352,7 @@ typedef struct ksock_peer __u32 ksnp_passive_ips[LNET_MAX_INTERFACES]; /* preferred local interfaces */ } ksock_peer_t; -typedef struct ksock_connreq -{ +typedef struct ksock_connreq { struct list_head ksncr_list; /* stash on ksnd_connd_connreqs */ lnet_ni_t *ksncr_ni; /* chosen NI */ struct socket *ksncr_sock; /* accepted socket */ @@ -372,8 +365,7 @@ extern ksock_tunables_t ksocknal_tunables; #define SOCKNAL_MATCH_YES 1 /* TX matches type of connection */ #define SOCKNAL_MATCH_MAY 2 /* TX can be sent on the connection, but not preferred */ -typedef struct ksock_proto -{ +typedef struct ksock_proto { int pro_version; /* version number of protocol */ int (*pro_send_hello)(ksock_conn_t *, ksock_hello_msg_t *); /* handshake function */ int (*pro_recv_hello)(ksock_conn_t *, ksock_hello_msg_t *, int);/* handshake function */ diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c index 521439954fc..d29f5f134b8 100644 --- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c +++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c @@ -107,7 +107,7 @@ ksocknal_free_tx (ksock_tx_t *tx) } } -int +static int ksocknal_send_iov (ksock_conn_t *conn, ksock_tx_t *tx) { struct iovec *iov = tx->tx_iov; @@ -144,7 +144,7 @@ ksocknal_send_iov (ksock_conn_t *conn, ksock_tx_t *tx) return rc; } -int +static int ksocknal_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx) { lnet_kiov_t *kiov = tx->tx_kiov; @@ -182,7 +182,7 @@ ksocknal_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx) return rc; } -int +static int ksocknal_transmit (ksock_conn_t *conn, ksock_tx_t *tx) { int rc; @@ -232,7 +232,7 @@ ksocknal_transmit (ksock_conn_t *conn, ksock_tx_t *tx) rc = -EAGAIN; /* Check if EAGAIN is due to memory pressure */ - if(rc == -EAGAIN && ksocknal_lib_memory_pressure(conn)) + if (rc == -EAGAIN && ksocknal_lib_memory_pressure(conn)) rc = -ENOMEM; break; @@ -248,7 +248,7 @@ ksocknal_transmit (ksock_conn_t *conn, ksock_tx_t *tx) return rc; } -int +static int ksocknal_recv_iov (ksock_conn_t *conn) { struct iovec *iov = conn->ksnc_rx_iov; @@ -281,7 +281,7 @@ ksocknal_recv_iov (ksock_conn_t *conn) if (nob < (int)iov->iov_len) { iov->iov_len -= nob; - iov->iov_base = (void *)((char *)iov->iov_base + nob); + iov->iov_base += nob; return -EAGAIN; } @@ -293,7 +293,7 @@ ksocknal_recv_iov (ksock_conn_t *conn) return rc; } -int +static int ksocknal_recv_kiov (ksock_conn_t *conn) { lnet_kiov_t *kiov = conn->ksnc_rx_kiov; @@ -337,7 +337,7 @@ ksocknal_recv_kiov (ksock_conn_t *conn) return 1; } -int +static int ksocknal_receive (ksock_conn_t *conn) { /* Return 1 on success, 0 on EOF, < 0 on error. @@ -499,7 +499,7 @@ ksocknal_uncheck_zc_req(ksock_tx_t *tx) ksocknal_tx_decref(tx); } -int +static int ksocknal_process_transmit (ksock_conn_t *conn, ksock_tx_t *tx) { int rc; @@ -579,7 +579,7 @@ ksocknal_process_transmit (ksock_conn_t *conn, ksock_tx_t *tx) return rc; } -void +static void ksocknal_launch_connection_locked (ksock_route_t *route) { @@ -1109,7 +1109,7 @@ ksocknal_new_packet (ksock_conn_t *conn, int nob_to_skip) return 0; } -int +static int ksocknal_process_receive (ksock_conn_t *conn) { lnet_hdr_t *lhdr; @@ -1537,9 +1537,9 @@ int ksocknal_scheduler(void *arg) nloops = 0; if (!did_something) { /* wait for something to do */ - cfs_wait_event_interruptible_exclusive( + rc = wait_event_interruptible_exclusive( sched->kss_waitq, - !ksocknal_sched_cansleep(sched), rc); + !ksocknal_sched_cansleep(sched)); LASSERT (rc == 0); } else { cond_resched(); @@ -1594,8 +1594,8 @@ void ksocknal_write_callback (ksock_conn_t *conn) conn->ksnc_tx_ready = 1; - if (!conn->ksnc_tx_scheduled && // not being progressed - !list_empty(&conn->ksnc_tx_queue)){//packets to send + if (!conn->ksnc_tx_scheduled && /* not being progressed */ + !list_empty(&conn->ksnc_tx_queue)) { /* packets to send */ list_add_tail (&conn->ksnc_tx_list, &sched->kss_tx_conns); conn->ksnc_tx_scheduled = 1; @@ -1608,7 +1608,7 @@ void ksocknal_write_callback (ksock_conn_t *conn) spin_unlock_bh(&sched->kss_lock); } -ksock_proto_t * +static ksock_proto_t * ksocknal_parse_proto_version (ksock_hello_msg_t *hello) { __u32 version = 0; @@ -1672,11 +1672,10 @@ ksocknal_send_hello (lnet_ni_t *ni, ksock_conn_t *conn, return conn->ksnc_proto->pro_send_hello(conn, hello); } -int +static int ksocknal_invert_type(int type) { - switch (type) - { + switch (type) { case SOCKLND_CONN_ANY: case SOCKLND_CONN_CONTROL: return type; @@ -1837,7 +1836,7 @@ ksocknal_recv_hello (lnet_ni_t *ni, ksock_conn_t *conn, return 0; } -int +static int ksocknal_connect (ksock_route_t *route) { LIST_HEAD (zombies); @@ -2233,7 +2232,6 @@ ksocknal_connd (void *arg) nloops = 0; schedule_timeout(timeout); - set_current_state(TASK_RUNNING); remove_wait_queue(&ksocknal_data.ksnd_connd_waitq, &wait); spin_lock_bh(connd_lock); } @@ -2244,7 +2242,7 @@ ksocknal_connd (void *arg) return 0; } -ksock_conn_t * +static ksock_conn_t * ksocknal_find_timed_out_conn (ksock_peer_t *peer) { /* We're called with a shared lock on ksnd_global_lock */ @@ -2354,7 +2352,7 @@ ksocknal_flush_stale_txs(ksock_peer_t *peer) ksocknal_txlist_done(peer->ksnp_ni, &stale_txs, 1); } -int +static int ksocknal_send_keepalive_locked(ksock_peer_t *peer) { ksock_sched_t *sched; @@ -2415,7 +2413,7 @@ ksocknal_send_keepalive_locked(ksock_peer_t *peer) } -void +static void ksocknal_check_peer_timeouts (int idx) { struct list_head *peers = &ksocknal_data.ksnd_peers[idx]; diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h index f14a60ce091..7a793d2d358 100644 --- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h +++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib-linux.h @@ -63,7 +63,6 @@ #include <linux/syscalls.h> #include "../../../include/linux/libcfs/libcfs.h" -#include "../../../include/linux/libcfs/linux/portals_compat25.h" #include <linux/crc32.h> static inline __u32 ksocknal_csum(__u32 crc, unsigned char const *p, size_t len) diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_modparams.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_modparams.c index 54c0019904f..66d78c9be65 100644 --- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_modparams.c +++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_modparams.c @@ -33,7 +33,7 @@ static int peer_credits = 8; module_param(peer_credits, int, 0444); MODULE_PARM_DESC(peer_credits, "# concurrent sends to 1 peer"); -static int peer_buffer_credits = 0; +static int peer_buffer_credits; module_param(peer_buffer_credits, int, 0444); MODULE_PARM_DESC(peer_buffer_credits, "# per-peer router buffer credits"); @@ -85,7 +85,7 @@ static int rx_buffer_size = DEFAULT_BUFFER_SIZE; module_param(rx_buffer_size, int, 0644); MODULE_PARM_DESC(rx_buffer_size, "socket rx buffer size (0 for system default)"); -static int nagle = 0; +static int nagle; module_param(nagle, int, 0644); MODULE_PARM_DESC(nagle, "enable NAGLE?"); @@ -110,11 +110,11 @@ static int keepalive_intvl = 5; module_param(keepalive_intvl, int, 0644); MODULE_PARM_DESC(keepalive_intvl, "seconds between probes"); -static int enable_csum = 0; +static int enable_csum; module_param(enable_csum, int, 0644); MODULE_PARM_DESC(enable_csum, "enable check sum"); -static int inject_csum_error = 0; +static int inject_csum_error; module_param(inject_csum_error, int, 0644); MODULE_PARM_DESC(inject_csum_error, "set non-zero to inject a checksum error"); @@ -126,7 +126,7 @@ static unsigned int zc_min_payload = (16 << 10); module_param(zc_min_payload, int, 0644); MODULE_PARM_DESC(zc_min_payload, "minimum payload size to zero copy"); -static unsigned int zc_recv = 0; +static unsigned int zc_recv; module_param(zc_recv, int, 0644); MODULE_PARM_DESC(zc_recv, "enable ZC recv for Chelsio driver"); diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c index 050a58d0880..9dde548070a 100644 --- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c +++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c @@ -495,7 +495,8 @@ ksocknal_send_hello_v1 (ksock_conn_t *conn, ksock_hello_msg_t *hello) hdr->msg.hello.type = cpu_to_le32 (hello->kshm_ctype); hdr->msg.hello.incarnation = cpu_to_le64 (hello->kshm_src_incarnation); - rc = libcfs_sock_write(sock, hdr, sizeof(*hdr),lnet_acceptor_timeout()); + rc = libcfs_sock_write(sock, hdr, sizeof(*hdr), + lnet_acceptor_timeout()); if (rc != 0) { CNETERR("Error %d sending HELLO hdr to %pI4h/%d\n", @@ -568,7 +569,8 @@ ksocknal_send_hello_v2 (ksock_conn_t *conn, ksock_hello_msg_t *hello) } static int -ksocknal_recv_hello_v1(ksock_conn_t *conn, ksock_hello_msg_t *hello,int timeout) +ksocknal_recv_hello_v1(ksock_conn_t *conn, ksock_hello_msg_t *hello, + int timeout) { struct socket *sock = conn->ksnc_sock; lnet_hdr_t *hdr; @@ -756,8 +758,7 @@ ksocknal_unpack_msg_v2(ksock_msg_t *msg) return; /* Do nothing */ } -ksock_proto_t ksocknal_protocol_v1x = -{ +ksock_proto_t ksocknal_protocol_v1x = { .pro_version = KSOCK_PROTO_V1, .pro_send_hello = ksocknal_send_hello_v1, .pro_recv_hello = ksocknal_recv_hello_v1, @@ -770,8 +771,7 @@ ksock_proto_t ksocknal_protocol_v1x = .pro_match_tx = ksocknal_match_tx }; -ksock_proto_t ksocknal_protocol_v2x = -{ +ksock_proto_t ksocknal_protocol_v2x = { .pro_version = KSOCK_PROTO_V2, .pro_send_hello = ksocknal_send_hello_v2, .pro_recv_hello = ksocknal_recv_hello_v2, @@ -784,8 +784,7 @@ ksock_proto_t ksocknal_protocol_v2x = .pro_match_tx = ksocknal_match_tx }; -ksock_proto_t ksocknal_protocol_v3x = -{ +ksock_proto_t ksocknal_protocol_v3x = { .pro_version = KSOCK_PROTO_V3, .pro_send_hello = ksocknal_send_hello_v2, .pro_recv_hello = ksocknal_recv_hello_v2, diff --git a/drivers/staging/lustre/lnet/lnet/acceptor.c b/drivers/staging/lustre/lnet/lnet/acceptor.c index 5dfb887a03a..72fd1bf70ca 100644 --- a/drivers/staging/lustre/lnet/lnet/acceptor.c +++ b/drivers/staging/lustre/lnet/lnet/acceptor.c @@ -434,11 +434,11 @@ accept2secure(const char *acc, long *sec) return 1; } else if (!strcmp(acc, "none")) { return 0; - } else { - LCONSOLE_ERROR_MSG(0x124, "Can't parse 'accept=\"%s\"'\n", - acc); - return -EINVAL; } + + LCONSOLE_ERROR_MSG(0x124, "Can't parse 'accept=\"%s\"'\n", + acc); + return -EINVAL; } int diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c index b28734a76fa..60bc2ae4fdf 100644 --- a/drivers/staging/lustre/lnet/lnet/api-ni.c +++ b/drivers/staging/lustre/lnet/lnet/api-ni.c @@ -73,8 +73,7 @@ lnet_get_networks(void) int rc; if (*networks != 0 && *ip2nets != 0) { - LCONSOLE_ERROR_MSG(0x101, "Please specify EITHER 'networks' or " - "'ip2nets' but not both at once\n"); + LCONSOLE_ERROR_MSG(0x101, "Please specify EITHER 'networks' or 'ip2nets' but not both at once\n"); return NULL; } @@ -177,7 +176,7 @@ lnet_create_locks(void) return -ENOMEM; } -static void lnet_assert_wire_constants (void) +static void lnet_assert_wire_constants(void) { /* Wire protocol assertions generated by 'wirecheck' * running on Linux robert.bartonsoftware.com 2.6.8-1.521 @@ -185,93 +184,93 @@ static void lnet_assert_wire_constants (void) * with gcc version 3.3.3 20040412 (Red Hat Linux 3.3.3-7) */ /* Constants... */ - CLASSERT (LNET_PROTO_TCP_MAGIC == 0xeebc0ded); - CLASSERT (LNET_PROTO_TCP_VERSION_MAJOR == 1); - CLASSERT (LNET_PROTO_TCP_VERSION_MINOR == 0); - CLASSERT (LNET_MSG_ACK == 0); - CLASSERT (LNET_MSG_PUT == 1); - CLASSERT (LNET_MSG_GET == 2); - CLASSERT (LNET_MSG_REPLY == 3); - CLASSERT (LNET_MSG_HELLO == 4); + CLASSERT(LNET_PROTO_TCP_MAGIC == 0xeebc0ded); + CLASSERT(LNET_PROTO_TCP_VERSION_MAJOR == 1); + CLASSERT(LNET_PROTO_TCP_VERSION_MINOR == 0); + CLASSERT(LNET_MSG_ACK == 0); + CLASSERT(LNET_MSG_PUT == 1); + CLASSERT(LNET_MSG_GET == 2); + CLASSERT(LNET_MSG_REPLY == 3); + CLASSERT(LNET_MSG_HELLO == 4); /* Checks for struct ptl_handle_wire_t */ - CLASSERT ((int)sizeof(lnet_handle_wire_t) == 16); - CLASSERT ((int)offsetof(lnet_handle_wire_t, wh_interface_cookie) == 0); - CLASSERT ((int)sizeof(((lnet_handle_wire_t *)0)->wh_interface_cookie) == 8); - CLASSERT ((int)offsetof(lnet_handle_wire_t, wh_object_cookie) == 8); - CLASSERT ((int)sizeof(((lnet_handle_wire_t *)0)->wh_object_cookie) == 8); + CLASSERT((int)sizeof(lnet_handle_wire_t) == 16); + CLASSERT((int)offsetof(lnet_handle_wire_t, wh_interface_cookie) == 0); + CLASSERT((int)sizeof(((lnet_handle_wire_t *)0)->wh_interface_cookie) == 8); + CLASSERT((int)offsetof(lnet_handle_wire_t, wh_object_cookie) == 8); + CLASSERT((int)sizeof(((lnet_handle_wire_t *)0)->wh_object_cookie) == 8); /* Checks for struct lnet_magicversion_t */ - CLASSERT ((int)sizeof(lnet_magicversion_t) == 8); - CLASSERT ((int)offsetof(lnet_magicversion_t, magic) == 0); - CLASSERT ((int)sizeof(((lnet_magicversion_t *)0)->magic) == 4); - CLASSERT ((int)offsetof(lnet_magicversion_t, version_major) == 4); - CLASSERT ((int)sizeof(((lnet_magicversion_t *)0)->version_major) == 2); - CLASSERT ((int)offsetof(lnet_magicversion_t, version_minor) == 6); - CLASSERT ((int)sizeof(((lnet_magicversion_t *)0)->version_minor) == 2); + CLASSERT((int)sizeof(lnet_magicversion_t) == 8); + CLASSERT((int)offsetof(lnet_magicversion_t, magic) == 0); + CLASSERT((int)sizeof(((lnet_magicversion_t *)0)->magic) == 4); + CLASSERT((int)offsetof(lnet_magicversion_t, version_major) == 4); + CLASSERT((int)sizeof(((lnet_magicversion_t *)0)->version_major) == 2); + CLASSERT((int)offsetof(lnet_magicversion_t, version_minor) == 6); + CLASSERT((int)sizeof(((lnet_magicversion_t *)0)->version_minor) == 2); /* Checks for struct lnet_hdr_t */ - CLASSERT ((int)sizeof(lnet_hdr_t) == 72); - CLASSERT ((int)offsetof(lnet_hdr_t, dest_nid) == 0); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->dest_nid) == 8); - CLASSERT ((int)offsetof(lnet_hdr_t, src_nid) == 8); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->src_nid) == 8); - CLASSERT ((int)offsetof(lnet_hdr_t, dest_pid) == 16); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->dest_pid) == 4); - CLASSERT ((int)offsetof(lnet_hdr_t, src_pid) == 20); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->src_pid) == 4); - CLASSERT ((int)offsetof(lnet_hdr_t, type) == 24); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->type) == 4); - CLASSERT ((int)offsetof(lnet_hdr_t, payload_length) == 28); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->payload_length) == 4); - CLASSERT ((int)offsetof(lnet_hdr_t, msg) == 32); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->msg) == 40); + CLASSERT((int)sizeof(lnet_hdr_t) == 72); + CLASSERT((int)offsetof(lnet_hdr_t, dest_nid) == 0); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->dest_nid) == 8); + CLASSERT((int)offsetof(lnet_hdr_t, src_nid) == 8); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->src_nid) == 8); + CLASSERT((int)offsetof(lnet_hdr_t, dest_pid) == 16); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->dest_pid) == 4); + CLASSERT((int)offsetof(lnet_hdr_t, src_pid) == 20); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->src_pid) == 4); + CLASSERT((int)offsetof(lnet_hdr_t, type) == 24); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->type) == 4); + CLASSERT((int)offsetof(lnet_hdr_t, payload_length) == 28); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->payload_length) == 4); + CLASSERT((int)offsetof(lnet_hdr_t, msg) == 32); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg) == 40); /* Ack */ - CLASSERT ((int)offsetof(lnet_hdr_t, msg.ack.dst_wmd) == 32); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->msg.ack.dst_wmd) == 16); - CLASSERT ((int)offsetof(lnet_hdr_t, msg.ack.match_bits) == 48); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->msg.ack.match_bits) == 8); - CLASSERT ((int)offsetof(lnet_hdr_t, msg.ack.mlength) == 56); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->msg.ack.mlength) == 4); + CLASSERT((int)offsetof(lnet_hdr_t, msg.ack.dst_wmd) == 32); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.ack.dst_wmd) == 16); + CLASSERT((int)offsetof(lnet_hdr_t, msg.ack.match_bits) == 48); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.ack.match_bits) == 8); + CLASSERT((int)offsetof(lnet_hdr_t, msg.ack.mlength) == 56); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.ack.mlength) == 4); /* Put */ - CLASSERT ((int)offsetof(lnet_hdr_t, msg.put.ack_wmd) == 32); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->msg.put.ack_wmd) == 16); - CLASSERT ((int)offsetof(lnet_hdr_t, msg.put.match_bits) == 48); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->msg.put.match_bits) == 8); - CLASSERT ((int)offsetof(lnet_hdr_t, msg.put.hdr_data) == 56); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->msg.put.hdr_data) == 8); - CLASSERT ((int)offsetof(lnet_hdr_t, msg.put.ptl_index) == 64); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->msg.put.ptl_index) == 4); - CLASSERT ((int)offsetof(lnet_hdr_t, msg.put.offset) == 68); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->msg.put.offset) == 4); + CLASSERT((int)offsetof(lnet_hdr_t, msg.put.ack_wmd) == 32); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.put.ack_wmd) == 16); + CLASSERT((int)offsetof(lnet_hdr_t, msg.put.match_bits) == 48); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.put.match_bits) == 8); + CLASSERT((int)offsetof(lnet_hdr_t, msg.put.hdr_data) == 56); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.put.hdr_data) == 8); + CLASSERT((int)offsetof(lnet_hdr_t, msg.put.ptl_index) == 64); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.put.ptl_index) == 4); + CLASSERT((int)offsetof(lnet_hdr_t, msg.put.offset) == 68); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.put.offset) == 4); /* Get */ - CLASSERT ((int)offsetof(lnet_hdr_t, msg.get.return_wmd) == 32); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->msg.get.return_wmd) == 16); - CLASSERT ((int)offsetof(lnet_hdr_t, msg.get.match_bits) == 48); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->msg.get.match_bits) == 8); - CLASSERT ((int)offsetof(lnet_hdr_t, msg.get.ptl_index) == 56); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->msg.get.ptl_index) == 4); - CLASSERT ((int)offsetof(lnet_hdr_t, msg.get.src_offset) == 60); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->msg.get.src_offset) == 4); - CLASSERT ((int)offsetof(lnet_hdr_t, msg.get.sink_length) == 64); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->msg.get.sink_length) == 4); + CLASSERT((int)offsetof(lnet_hdr_t, msg.get.return_wmd) == 32); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.get.return_wmd) == 16); + CLASSERT((int)offsetof(lnet_hdr_t, msg.get.match_bits) == 48); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.get.match_bits) == 8); + CLASSERT((int)offsetof(lnet_hdr_t, msg.get.ptl_index) == 56); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.get.ptl_index) == 4); + CLASSERT((int)offsetof(lnet_hdr_t, msg.get.src_offset) == 60); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.get.src_offset) == 4); + CLASSERT((int)offsetof(lnet_hdr_t, msg.get.sink_length) == 64); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.get.sink_length) == 4); /* Reply */ - CLASSERT ((int)offsetof(lnet_hdr_t, msg.reply.dst_wmd) == 32); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->msg.reply.dst_wmd) == 16); + CLASSERT((int)offsetof(lnet_hdr_t, msg.reply.dst_wmd) == 32); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.reply.dst_wmd) == 16); /* Hello */ - CLASSERT ((int)offsetof(lnet_hdr_t, msg.hello.incarnation) == 32); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->msg.hello.incarnation) == 8); - CLASSERT ((int)offsetof(lnet_hdr_t, msg.hello.type) == 40); - CLASSERT ((int)sizeof(((lnet_hdr_t *)0)->msg.hello.type) == 4); + CLASSERT((int)offsetof(lnet_hdr_t, msg.hello.incarnation) == 32); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.hello.incarnation) == 8); + CLASSERT((int)offsetof(lnet_hdr_t, msg.hello.type) == 40); + CLASSERT((int)sizeof(((lnet_hdr_t *)0)->msg.hello.type) == 4); } static lnd_t * -lnet_find_lnd_by_type (int type) +lnet_find_lnd_by_type(int type) { lnd_t *lnd; struct list_head *tmp; @@ -288,15 +287,15 @@ lnet_find_lnd_by_type (int type) } void -lnet_register_lnd (lnd_t *lnd) +lnet_register_lnd(lnd_t *lnd) { LNET_MUTEX_LOCK(&the_lnet.ln_lnd_mutex); - LASSERT (the_lnet.ln_init); - LASSERT (libcfs_isknown_lnd(lnd->lnd_type)); - LASSERT (lnet_find_lnd_by_type(lnd->lnd_type) == NULL); + LASSERT(the_lnet.ln_init); + LASSERT(libcfs_isknown_lnd(lnd->lnd_type)); + LASSERT(lnet_find_lnd_by_type(lnd->lnd_type) == NULL); - list_add_tail (&lnd->lnd_list, &the_lnet.ln_lnds); + list_add_tail(&lnd->lnd_list, &the_lnet.ln_lnds); lnd->lnd_refcount = 0; CDEBUG(D_NET, "%s LND registered\n", libcfs_lnd2str(lnd->lnd_type)); @@ -306,15 +305,15 @@ lnet_register_lnd (lnd_t *lnd) EXPORT_SYMBOL(lnet_register_lnd); void -lnet_unregister_lnd (lnd_t *lnd) +lnet_unregister_lnd(lnd_t *lnd) { LNET_MUTEX_LOCK(&the_lnet.ln_lnd_mutex); - LASSERT (the_lnet.ln_init); - LASSERT (lnet_find_lnd_by_type(lnd->lnd_type) == lnd); - LASSERT (lnd->lnd_refcount == 0); + LASSERT(the_lnet.ln_init); + LASSERT(lnet_find_lnd_by_type(lnd->lnd_type) == lnd); + LASSERT(lnd->lnd_refcount == 0); - list_del (&lnd->lnd_list); + list_del(&lnd->lnd_list); CDEBUG(D_NET, "%s LND unregistered\n", libcfs_lnd2str(lnd->lnd_type)); LNET_MUTEX_UNLOCK(&the_lnet.ln_lnd_mutex); @@ -367,35 +366,34 @@ EXPORT_SYMBOL(lnet_counters_reset); #ifdef LNET_USE_LIB_FREELIST int -lnet_freelist_init (lnet_freelist_t *fl, int n, int size) +lnet_freelist_init(lnet_freelist_t *fl, int n, int size) { char *space; - LASSERT (n > 0); + LASSERT(n > 0); - size += offsetof (lnet_freeobj_t, fo_contents); + size += offsetof(lnet_freeobj_t, fo_contents); LIBCFS_ALLOC(space, n * size); if (space == NULL) - return (-ENOMEM); + return -ENOMEM; - INIT_LIST_HEAD (&fl->fl_list); + INIT_LIST_HEAD(&fl->fl_list); fl->fl_objs = space; fl->fl_nobjs = n; fl->fl_objsize = size; - do - { - memset (space, 0, size); - list_add ((struct list_head *)space, &fl->fl_list); + do { + memset(space, 0, size); + list_add((struct list_head *)space, &fl->fl_list); space += size; } while (--n != 0); - return (0); + return 0; } void -lnet_freelist_fini (lnet_freelist_t *fl) +lnet_freelist_fini(lnet_freelist_t *fl) { struct list_head *el; int count; @@ -407,16 +405,16 @@ lnet_freelist_fini (lnet_freelist_t *fl) for (el = fl->fl_list.next; el != &fl->fl_list; el = el->next) count++; - LASSERT (count == fl->fl_nobjs); + LASSERT(count == fl->fl_nobjs); LIBCFS_FREE(fl->fl_objs, fl->fl_nobjs * fl->fl_objsize); - memset (fl, 0, sizeof (*fl)); + memset(fl, 0, sizeof(*fl)); } #endif /* LNET_USE_LIB_FREELIST */ static __u64 -lnet_create_interface_cookie (void) +lnet_create_interface_cookie(void) { /* NB the interface cookie in wire handles guards against delayed * replies and ACKs appearing valid after reboot. Initialisation time, @@ -424,6 +422,7 @@ lnet_create_interface_cookie (void) * easily good enough. */ struct timeval tv; __u64 cookie; + do_gettimeofday(&tv); cookie = tv.tv_sec; cookie *= 1000000; @@ -615,11 +614,11 @@ lnet_prepare(lnet_pid_t requested_pid) struct lnet_res_container **recs; int rc = 0; - LASSERT (the_lnet.ln_refcount == 0); + LASSERT(the_lnet.ln_refcount == 0); the_lnet.ln_routing = 0; - LASSERT ((requested_pid & LNET_PID_USERFLAG) == 0); + LASSERT((requested_pid & LNET_PID_USERFLAG) == 0); the_lnet.ln_pid = requested_pid; INIT_LIST_HEAD(&the_lnet.ln_test_peers); @@ -684,7 +683,7 @@ lnet_prepare(lnet_pid_t requested_pid) } int -lnet_unprepare (void) +lnet_unprepare(void) { /* NB no LNET_LOCK since this is the last reference. All LND instances * have shut down already, so it is safe to unlink and free all @@ -875,7 +874,7 @@ lnet_islocalnid(lnet_nid_t nid) } int -lnet_count_acceptor_nis (void) +lnet_count_acceptor_nis(void) { /* Return the # of NIs that need the acceptor. */ int count = 0; @@ -914,7 +913,7 @@ lnet_ni_tq_credits(lnet_ni_t *ni) } static void -lnet_shutdown_lndnis (void) +lnet_shutdown_lndnis(void) { int i; int islo; @@ -1004,7 +1003,7 @@ lnet_shutdown_lndnis (void) islo = ni->ni_lnd->lnd_type == LOLND; - LASSERT (!in_interrupt ()); + LASSERT(!in_interrupt()); (ni->ni_lnd->lnd_shutdown)(ni); /* can't deref lnd anymore now; it might have unregistered @@ -1031,7 +1030,7 @@ lnet_shutdown_lndnis (void) } static int -lnet_startup_lndnis (void) +lnet_startup_lndnis(void) { lnd_t *lnd; struct lnet_ni *ni; @@ -1056,7 +1055,7 @@ lnet_startup_lndnis (void) ni = list_entry(nilist.next, lnet_ni_t, ni_list); lnd_type = LNET_NETTYP(LNET_NIDNET(ni->ni_nid)); - LASSERT (libcfs_isknown_lnd(lnd_type)); + LASSERT(libcfs_isknown_lnd(lnd_type)); if (lnd_type == CIBLND || lnd_type == OPENIBLND || @@ -1097,8 +1096,7 @@ lnet_startup_lndnis (void) LNET_MUTEX_UNLOCK(&the_lnet.ln_lnd_mutex); if (rc != 0) { - LCONSOLE_ERROR_MSG(0x105, "Error %d starting up LNI %s" - "\n", + LCONSOLE_ERROR_MSG(0x105, "Error %d starting up LNI %s\n", rc, libcfs_lnd2str(lnd->lnd_type)); lnet_net_lock(LNET_LOCK_EX); lnd->lnd_refcount--; @@ -1106,7 +1104,7 @@ lnet_startup_lndnis (void) goto failed; } - LASSERT (ni->ni_peertimeout <= 0 || lnd->lnd_query != NULL); + LASSERT(ni->ni_peertimeout <= 0 || lnd->lnd_query != NULL); list_del(&ni->ni_list); @@ -1124,7 +1122,7 @@ lnet_startup_lndnis (void) if (lnd->lnd_type == LOLND) { lnet_ni_addref(ni); - LASSERT (the_lnet.ln_loni == NULL); + LASSERT(the_lnet.ln_loni == NULL); the_lnet.ln_loni = ni; continue; } @@ -1154,8 +1152,7 @@ lnet_startup_lndnis (void) if (the_lnet.ln_eq_waitni != NULL && nicount > 1) { lnd_type = the_lnet.ln_eq_waitni->ni_lnd->lnd_type; - LCONSOLE_ERROR_MSG(0x109, "LND %s can only run single-network" - "\n", + LCONSOLE_ERROR_MSG(0x109, "LND %s can only run single-network\n", libcfs_lnd2str(lnd_type)); goto failed; } @@ -1201,8 +1198,7 @@ LNetInit(void) LASSERT(the_lnet.ln_cpt_number > 0); if (the_lnet.ln_cpt_number > LNET_CPT_MAX) { /* we are under risk of consuming all lh_cookie */ - CERROR("Can't have %d CPTs for LNet (max allowed is %d), " - "please change setting of CPT-table and retry\n", + CERROR("Can't have %d CPTs for LNet (max allowed is %d), please change setting of CPT-table and retry\n", the_lnet.ln_cpt_number, LNET_CPT_MAX); return -1; } @@ -1289,7 +1285,7 @@ LNetNIInit(lnet_pid_t requested_pid) LNET_MUTEX_LOCK(&the_lnet.ln_api_mutex); - LASSERT (the_lnet.ln_init); + LASSERT(the_lnet.ln_init); CDEBUG(D_OTHER, "refs %d\n", the_lnet.ln_refcount); if (the_lnet.ln_refcount > 0) { @@ -1356,7 +1352,7 @@ LNetNIInit(lnet_pid_t requested_pid) failed1: lnet_unprepare(); failed0: - LASSERT (rc < 0); + LASSERT(rc < 0); out: LNET_MUTEX_UNLOCK(&the_lnet.ln_api_mutex); return rc; @@ -1377,13 +1373,13 @@ LNetNIFini(void) { LNET_MUTEX_LOCK(&the_lnet.ln_api_mutex); - LASSERT (the_lnet.ln_init); - LASSERT (the_lnet.ln_refcount > 0); + LASSERT(the_lnet.ln_init); + LASSERT(the_lnet.ln_refcount > 0); if (the_lnet.ln_refcount != 1) { the_lnet.ln_refcount--; } else { - LASSERT (!the_lnet.ln_niinit_self); + LASSERT(!the_lnet.ln_niinit_self); lnet_proc_fini(); lnet_router_checker_stop(); @@ -1424,8 +1420,8 @@ LNetCtl(unsigned int cmd, void *arg) lnet_ni_t *ni; int rc; - LASSERT (the_lnet.ln_init); - LASSERT (the_lnet.ln_refcount > 0); + LASSERT(the_lnet.ln_init); + LASSERT(the_lnet.ln_refcount > 0); switch (cmd) { case IOC_LIBCFS_GET_NI: @@ -1595,7 +1591,7 @@ lnet_create_ping_info(void) if (rc == -ENOENT) break; - LASSERT (rc == 0); + LASSERT(rc == 0); } infosz = offsetof(lnet_ping_info_t, pi_ni[n]); @@ -1614,7 +1610,7 @@ lnet_create_ping_info(void) lnet_ni_status_t *ns = &pinfo->pi_ni[i]; rc = LNetGetId(i, &id); - LASSERT (rc == 0); + LASSERT(rc == 0); ns->ns_nid = id.nid; ns->ns_status = LNET_NI_STATUS_UP; @@ -1718,10 +1714,10 @@ lnet_ping_target_init(void) failed_2: rc2 = LNetMEUnlink(meh); - LASSERT (rc2 == 0); + LASSERT(rc2 == 0); failed_1: rc2 = LNetEQFree(the_lnet.ln_ping_target_eq); - LASSERT (rc2 == 0); + LASSERT(rc2 == 0); failed_0: lnet_destroy_ping_info(); return rc; @@ -1744,7 +1740,7 @@ lnet_ping_target_fini(void) timeout_ms, &event, &which); /* I expect overflow... */ - LASSERT (rc >= 0 || rc == -EOVERFLOW); + LASSERT(rc >= 0 || rc == -EOVERFLOW); if (rc == 0) { /* timed out: provide a diagnostic */ @@ -1759,13 +1755,13 @@ lnet_ping_target_fini(void) } rc = LNetEQFree(the_lnet.ln_ping_target_eq); - LASSERT (rc == 0); + LASSERT(rc == 0); lnet_destroy_ping_info(); cfs_restore_sigs(blocked); } int -lnet_ping (lnet_process_id_t id, int timeout_ms, lnet_process_id_t *ids, int n_ids) +lnet_ping(lnet_process_id_t id, int timeout_ms, lnet_process_id_t *ids, int n_ids) { lnet_handle_eq_t eqh; lnet_handle_md_t mdh; @@ -1827,7 +1823,7 @@ lnet_ping (lnet_process_id_t id, int timeout_ms, lnet_process_id_t *ids, int n_i /* Don't CERROR; this could be deliberate! */ rc2 = LNetMDUnlink(mdh); - LASSERT (rc2 == 0); + LASSERT(rc2 == 0); /* NB must wait for the UNLINK event below... */ unlinked = 1; @@ -1849,7 +1845,7 @@ lnet_ping (lnet_process_id_t id, int timeout_ms, lnet_process_id_t *ids, int n_i (rc2 <= 0) ? -1 : event.status, (rc2 > 0 && event.unlinked) ? " unlinked" : ""); - LASSERT (rc2 != -EOVERFLOW); /* can't miss anything */ + LASSERT(rc2 != -EOVERFLOW); /* can't miss anything */ if (rc2 <= 0 || event.status != 0) { /* timeout or error */ @@ -1885,7 +1881,7 @@ lnet_ping (lnet_process_id_t id, int timeout_ms, lnet_process_id_t *ids, int n_i } nob = rc; - LASSERT (nob >= 0 && nob <= infosz); + LASSERT(nob >= 0 && nob <= infosz); rc = -EPROTO; /* if I can't parse... */ @@ -1940,7 +1936,7 @@ lnet_ping (lnet_process_id_t id, int timeout_ms, lnet_process_id_t *ids, int n_i rc2 = LNetEQFree(eqh); if (rc2 != 0) CERROR("rc2 %d\n", rc2); - LASSERT (rc2 == 0); + LASSERT(rc2 == 0); out_0: LIBCFS_FREE(info, infosz); diff --git a/drivers/staging/lustre/lnet/lnet/config.c b/drivers/staging/lustre/lnet/lnet/config.c index 7c8b9476bfb..af171e25a5e 100644 --- a/drivers/staging/lustre/lnet/lnet/config.c +++ b/drivers/staging/lustre/lnet/lnet/config.c @@ -47,7 +47,7 @@ static int lnet_tbnob; /* track text buf allocation */ #define LNET_MAX_TEXTBUF_NOB (64<<10) /* bound allocation */ #define LNET_SINGLE_TEXTBUF_NOB (4<<10) -void +static void lnet_syntax(char *name, char *str, int offset, int width) { static char dots[LNET_SINGLE_TEXTBUF_NOB]; @@ -64,7 +64,7 @@ lnet_syntax(char *name, char *str, int offset, int width) (width < 1) ? 0 : width - 1, dashes); } -int +static int lnet_issep(char c) { switch (c) { @@ -77,7 +77,7 @@ lnet_issep(char c) } } -int +static int lnet_net_unique(__u32 net, struct list_head *nilist) { struct list_head *tmp; @@ -108,7 +108,7 @@ lnet_ni_free(struct lnet_ni *ni) LIBCFS_FREE(ni, sizeof(*ni)); } -lnet_ni_t * +static lnet_ni_t * lnet_ni_alloc(__u32 net, struct cfs_expr_list *el, struct list_head *nilist) { struct lnet_tx_queue *tq; @@ -365,7 +365,7 @@ lnet_parse_networks(struct list_head *nilist, char *networks) return -EINVAL; } -lnet_text_buf_t * +static lnet_text_buf_t * lnet_new_text_buf(int str_len) { lnet_text_buf_t *ltb; @@ -394,14 +394,14 @@ lnet_new_text_buf(int str_len) return ltb; } -void +static void lnet_free_text_buf(lnet_text_buf_t *ltb) { lnet_tbnob -= ltb->ltb_size; LIBCFS_FREE(ltb, ltb->ltb_size); } -void +static void lnet_free_text_bufs(struct list_head *tbs) { lnet_text_buf_t *ltb; @@ -414,22 +414,7 @@ lnet_free_text_bufs(struct list_head *tbs) } } -void -lnet_print_text_bufs(struct list_head *tbs) -{ - struct list_head *tmp; - lnet_text_buf_t *ltb; - - list_for_each(tmp, tbs) { - ltb = list_entry(tmp, lnet_text_buf_t, ltb_list); - - CDEBUG(D_WARNING, "%s\n", ltb->ltb_text); - } - - CDEBUG(D_WARNING, "%d allocated\n", lnet_tbnob); -} - -int +static int lnet_str2tbs_sep(struct list_head *tbs, char *str) { struct list_head pending; @@ -487,7 +472,7 @@ lnet_str2tbs_sep(struct list_head *tbs, char *str) return 0; } -int +static int lnet_expand1tb(struct list_head *list, char *str, char *sep1, char *sep2, char *item, int itemlen) @@ -512,7 +497,7 @@ lnet_expand1tb(struct list_head *list, return 0; } -int +static int lnet_str2tbs_expand(struct list_head *tbs, char *str) { char num[16]; @@ -592,7 +577,7 @@ lnet_str2tbs_expand(struct list_head *tbs, char *str) return -1; } -int +static int lnet_parse_hops(char *str, unsigned int *hops) { int len = strlen(str); @@ -605,7 +590,7 @@ lnet_parse_hops(char *str, unsigned int *hops) #define LNET_PRIORITY_SEPARATOR (':') -int +static int lnet_parse_priority(char *str, unsigned int *priority, char **token) { int nob; @@ -635,7 +620,7 @@ lnet_parse_priority(char *str, unsigned int *priority, char **token) return 0; } -int +static int lnet_parse_route(char *str, int *im_a_router) { /* static scratch buffer OK (single threaded) */ @@ -778,7 +763,7 @@ lnet_parse_route(char *str, int *im_a_router) return myrc; } -int +static int lnet_parse_route_tbs(struct list_head *tbs, int *im_a_router) { lnet_text_buf_t *ltb; @@ -819,7 +804,7 @@ lnet_parse_routes(char *routes, int *im_a_router) return rc; } -int +static int lnet_match_network_token(char *token, int len, __u32 *ipaddrs, int nip) { LIST_HEAD(list); @@ -838,7 +823,7 @@ lnet_match_network_token(char *token, int len, __u32 *ipaddrs, int nip) return rc; } -int +static int lnet_match_network_tokens(char *net_entry, __u32 *ipaddrs, int nip) { static char tokens[LNET_SINGLE_TEXTBUF_NOB]; @@ -895,7 +880,7 @@ lnet_match_network_tokens(char *net_entry, __u32 *ipaddrs, int nip) return 1; } -__u32 +static __u32 lnet_netspec2net(char *netspec) { char *bracket = strchr(netspec, '('); @@ -912,7 +897,7 @@ lnet_netspec2net(char *netspec) return net; } -int +static int lnet_splitnets(char *source, struct list_head *nets) { int offset = 0; @@ -992,7 +977,7 @@ lnet_splitnets(char *source, struct list_head *nets) } } -int +static int lnet_match_networks(char **networksp, char *ip2nets, __u32 *ipaddrs, int nip) { static char networks[LNET_SINGLE_TEXTBUF_NOB]; @@ -1112,13 +1097,13 @@ lnet_match_networks(char **networksp, char *ip2nets, __u32 *ipaddrs, int nip) return count; } -void +static void lnet_ipaddr_free_enumeration(__u32 *ipaddrs, int nip) { LIBCFS_FREE(ipaddrs, nip * sizeof(*ipaddrs)); } -int +static int lnet_ipaddr_enumerate(__u32 **ipaddrsp) { int up; @@ -1187,7 +1172,7 @@ lnet_ipaddr_enumerate(__u32 **ipaddrsp) int lnet_parse_ip2nets(char **networksp, char *ip2nets) { - __u32 *ipaddrs; + __u32 *ipaddrs = NULL; int nip = lnet_ipaddr_enumerate(&ipaddrs); int rc; diff --git a/drivers/staging/lustre/lnet/lnet/lib-eq.c b/drivers/staging/lustre/lnet/lnet/lib-eq.c index bd45478e994..863cc3735ed 100644 --- a/drivers/staging/lustre/lnet/lnet/lib-eq.c +++ b/drivers/staging/lustre/lnet/lnet/lib-eq.c @@ -72,8 +72,8 @@ LNetEQAlloc(unsigned int count, lnet_eq_handler_t callback, { lnet_eq_t *eq; - LASSERT (the_lnet.ln_init); - LASSERT (the_lnet.ln_refcount > 0); + LASSERT(the_lnet.ln_init); + LASSERT(the_lnet.ln_refcount > 0); /* We need count to be a power of 2 so that when eq_{enq,deq}_seq * overflow, they don't skip entries, so the queue has the same @@ -82,10 +82,7 @@ LNetEQAlloc(unsigned int count, lnet_eq_handler_t callback, count = cfs_power2_roundup(count); if (callback != LNET_EQ_HANDLER_NONE && count != 0) { - CWARN("EQ callback is guaranteed to get every event, " - "do you still want to set eqcount %d for polling " - "event which will have locking overhead? " - "Please contact with developer to confirm\n", count); + CWARN("EQ callback is guaranteed to get every event, do you still want to set eqcount %d for polling event which will have locking overhead? Please contact with developer to confirm\n", count); } /* count can be 0 if only need callback, we can eliminate @@ -287,7 +284,7 @@ lnet_eq_dequeue_event(lnet_eq_t *eq, lnet_event_t *ev) * EQ has been dropped due to limited space in the EQ. */ int -LNetEQGet (lnet_handle_eq_t eventq, lnet_event_t *event) +LNetEQGet(lnet_handle_eq_t eventq, lnet_event_t *event) { int which; @@ -313,7 +310,7 @@ EXPORT_SYMBOL(LNetEQGet); * EQ has been dropped due to limited space in the EQ. */ int -LNetEQWait (lnet_handle_eq_t eventq, lnet_event_t *event) +LNetEQWait(lnet_handle_eq_t eventq, lnet_event_t *event) { int which; @@ -400,8 +397,8 @@ LNetEQPoll(lnet_handle_eq_t *eventqs, int neq, int timeout_ms, int rc; int i; - LASSERT (the_lnet.ln_init); - LASSERT (the_lnet.ln_refcount > 0); + LASSERT(the_lnet.ln_init); + LASSERT(the_lnet.ln_refcount > 0); if (neq < 1) return -ENOENT; diff --git a/drivers/staging/lustre/lnet/lnet/lib-md.c b/drivers/staging/lustre/lnet/lnet/lib-md.c index 1f386e09b53..e4d906a6563 100644 --- a/drivers/staging/lustre/lnet/lnet/lib-md.c +++ b/drivers/staging/lustre/lnet/lnet/lib-md.c @@ -52,7 +52,8 @@ lnet_md_unlink(lnet_libmd_t *md) md->md_flags |= LNET_MD_FLAG_ZOMBIE; - /* Disassociate from ME (if any), and unlink it if it was created + /* Disassociate from ME (if any), + * and unlink it if it was created * with LNET_UNLINK */ if (me != NULL) { /* detach MD from portal */ @@ -109,11 +110,12 @@ lnet_md_build(lnet_libmd_t *lmd, lnet_md_t *umd, int unlink) lmd->md_niov = niov = umd->length; memcpy(lmd->md_iov.iov, umd->start, - niov * sizeof (lmd->md_iov.iov[0])); + niov * sizeof(lmd->md_iov.iov[0])); for (i = 0; i < (int)niov; i++) { /* We take the base address on trust */ - if (lmd->md_iov.iov[i].iov_len <= 0) /* invalid length */ + /* invalid length */ + if (lmd->md_iov.iov[i].iov_len <= 0) return -EINVAL; total_length += lmd->md_iov.iov[i].iov_len; @@ -123,18 +125,18 @@ lnet_md_build(lnet_libmd_t *lmd, lnet_md_t *umd, int unlink) if ((umd->options & LNET_MD_MAX_SIZE) != 0 && /* max size used */ (umd->max_size < 0 || - umd->max_size > total_length)) // illegal max_size + umd->max_size > total_length)) /* illegal max_size */ return -EINVAL; } else if ((umd->options & LNET_MD_KIOV) != 0) { lmd->md_niov = niov = umd->length; memcpy(lmd->md_iov.kiov, umd->start, - niov * sizeof (lmd->md_iov.kiov[0])); + niov * sizeof(lmd->md_iov.kiov[0])); for (i = 0; i < (int)niov; i++) { /* We take the page pointer on trust */ if (lmd->md_iov.kiov[i].kiov_offset + - lmd->md_iov.kiov[i].kiov_len > PAGE_CACHE_SIZE ) + lmd->md_iov.kiov[i].kiov_len > PAGE_CACHE_SIZE) return -EINVAL; /* invalid length */ total_length += lmd->md_iov.kiov[i].kiov_len; @@ -144,7 +146,7 @@ lnet_md_build(lnet_libmd_t *lmd, lnet_md_t *umd, int unlink) if ((umd->options & LNET_MD_MAX_SIZE) != 0 && /* max size used */ (umd->max_size < 0 || - umd->max_size > total_length)) // illegal max_size + umd->max_size > total_length)) /* illegal max_size */ return -EINVAL; } else { /* contiguous */ lmd->md_length = umd->length; @@ -154,7 +156,7 @@ lnet_md_build(lnet_libmd_t *lmd, lnet_md_t *umd, int unlink) if ((umd->options & LNET_MD_MAX_SIZE) != 0 && /* max size used */ (umd->max_size < 0 || - umd->max_size > (int)umd->length)) // illegal max_size + umd->max_size > (int)umd->length)) /* illegal max_size */ return -EINVAL; } @@ -206,7 +208,8 @@ lnet_md_deconstruct(lnet_libmd_t *lmd, lnet_md_t *umd) * and that's all. */ umd->start = lmd->md_start; - umd->length = ((lmd->md_options & (LNET_MD_IOVEC | LNET_MD_KIOV)) == 0) ? + umd->length = ((lmd->md_options & + (LNET_MD_IOVEC | LNET_MD_KIOV)) == 0) ? lmd->md_length : lmd->md_niov; umd->threshold = lmd->md_threshold; umd->max_size = lmd->md_max_size; @@ -263,15 +266,15 @@ int LNetMDAttach(lnet_handle_me_t meh, lnet_md_t umd, lnet_unlink_t unlink, lnet_handle_md_t *handle) { - LIST_HEAD (matches); - LIST_HEAD (drops); + LIST_HEAD(matches); + LIST_HEAD(drops); struct lnet_me *me; struct lnet_libmd *md; int cpt; int rc; - LASSERT (the_lnet.ln_init); - LASSERT (the_lnet.ln_refcount > 0); + LASSERT(the_lnet.ln_init); + LASSERT(the_lnet.ln_refcount > 0); if (lnet_md_validate(&umd) != 0) return -EINVAL; @@ -347,8 +350,8 @@ LNetMDBind(lnet_md_t umd, lnet_unlink_t unlink, lnet_handle_md_t *handle) int cpt; int rc; - LASSERT (the_lnet.ln_init); - LASSERT (the_lnet.ln_refcount > 0); + LASSERT(the_lnet.ln_init); + LASSERT(the_lnet.ln_refcount > 0); if (lnet_md_validate(&umd) != 0) return -EINVAL; @@ -416,7 +419,7 @@ EXPORT_SYMBOL(LNetMDBind); * \retval -ENOENT If \a mdh does not point to a valid MD object. */ int -LNetMDUnlink (lnet_handle_md_t mdh) +LNetMDUnlink(lnet_handle_md_t mdh) { lnet_event_t ev; lnet_libmd_t *md; diff --git a/drivers/staging/lustre/lnet/lnet/lib-ptl.c b/drivers/staging/lustre/lnet/lnet/lib-ptl.c index 91767c9e15d..720c73be4d3 100644 --- a/drivers/staging/lustre/lnet/lnet/lib-ptl.c +++ b/drivers/staging/lustre/lnet/lnet/lib-ptl.c @@ -712,7 +712,7 @@ lnet_ptl_attach_md(lnet_me_t *me, lnet_libmd_t *md, lnet_ptl_unlock(ptl); } -void +static void lnet_ptl_cleanup(struct lnet_portal *ptl) { struct lnet_match_table *mtable; @@ -750,7 +750,7 @@ lnet_ptl_cleanup(struct lnet_portal *ptl) ptl->ptl_mtables = NULL; } -int +static int lnet_ptl_setup(struct lnet_portal *ptl, int index) { struct lnet_match_table *mtable; diff --git a/drivers/staging/lustre/lnet/lnet/router.c b/drivers/staging/lustre/lnet/lnet/router.c index ac38ad27107..b5b8fb576bf 100644 --- a/drivers/staging/lustre/lnet/lnet/router.c +++ b/drivers/staging/lustre/lnet/lnet/router.c @@ -321,7 +321,7 @@ lnet_add_route(__u32 net, unsigned int hops, lnet_nid_t gateway, LNET_NETTYP(net) == LOLND || LNET_NIDNET(gateway) == net || hops < 1 || hops > 255) - return (-EINVAL); + return -EINVAL; if (lnet_islocalnet(net)) /* it's a local network */ return 0; /* ignore the route entry */ diff --git a/drivers/staging/lustre/lnet/lnet/router_proc.c b/drivers/staging/lustre/lnet/lnet/router_proc.c index 166c1e647e2..6e8f7e2bbcf 100644 --- a/drivers/staging/lustre/lnet/lnet/router_proc.c +++ b/drivers/staging/lustre/lnet/lnet/router_proc.c @@ -90,9 +90,10 @@ enum { #define LNET_PROC_VERSION(v) ((unsigned int)((v) & LNET_PROC_VER_MASK)) -static int proc_call_handler(void *data, int write, loff_t *ppos, void *buffer, - size_t *lenp, int (*handler)(void *data, int write, - loff_t pos, void *buffer, int len)) +static int proc_call_handler(void *data, int write, loff_t *ppos, + void __user *buffer, size_t *lenp, + int (*handler)(void *data, int write, + loff_t pos, void __user *buffer, int len)) { int rc = handler(data, write, *ppos, buffer, *lenp); @@ -109,7 +110,7 @@ static int proc_call_handler(void *data, int write, loff_t *ppos, void *buffer, } static int __proc_lnet_stats(void *data, int write, - loff_t pos, void *buffer, int nob) + loff_t pos, void __user *buffer, int nob) { int rc; lnet_counters_t *ctrs; @@ -592,7 +593,7 @@ int proc_lnet_peers(struct ctl_table *table, int write, void __user *buffer, } static int __proc_lnet_buffers(void *data, int write, - loff_t pos, void *buffer, int nob) + loff_t pos, void __user *buffer, int nob) { char *s; char *tmpstr; @@ -815,7 +816,7 @@ static struct lnet_portal_rotors portal_rotors[] = { extern int portal_rotor; static int __proc_lnet_portal_rotor(void *data, int write, - loff_t pos, void *buffer, int nob) + loff_t pos, void __user *buffer, int nob) { const int buf_len = 128; char *buf; diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c index bcce919c043..a94f336d578 100644 --- a/drivers/staging/lustre/lnet/selftest/brw_test.c +++ b/drivers/staging/lustre/lnet/selftest/brw_test.c @@ -66,7 +66,7 @@ brw_client_fini(sfw_test_instance_t *tsi) } } -int +static int brw_client_init(sfw_test_instance_t *tsi) { sfw_session_t *sn = tsi->tsi_batch->bat_session; @@ -131,7 +131,7 @@ brw_client_init(sfw_test_instance_t *tsi) #define BRW_MAGIC 0xeeb0eeb1eeb2eeb3ULL #define BRW_MSIZE sizeof(__u64) -int +static int brw_inject_one_error(void) { struct timeval tv; @@ -147,7 +147,7 @@ brw_inject_one_error(void) return brw_inject_errors--; } -void +static void brw_fill_page(struct page *pg, int pattern, __u64 magic) { char *addr = page_address(pg); @@ -178,7 +178,7 @@ brw_fill_page(struct page *pg, int pattern, __u64 magic) return; } -int +static int brw_check_page(struct page *pg, int pattern, __u64 magic) { char *addr = page_address(pg); @@ -221,7 +221,7 @@ bad_data: return 1; } -void +static void brw_fill_bulk(srpc_bulk_t *bk, int pattern, __u64 magic) { int i; diff --git a/drivers/staging/lustre/lnet/selftest/console.c b/drivers/staging/lustre/lnet/selftest/console.c index 89e1b4bd5a5..5dad9f1f946 100644 --- a/drivers/staging/lustre/lnet/selftest/console.c +++ b/drivers/staging/lustre/lnet/selftest/console.c @@ -910,7 +910,7 @@ lstcon_batch_list(int index, int len, char *name_up) list_for_each_entry(bat, &console_session.ses_bat_list, bat_link) { if (index-- == 0) { - return copy_to_user(name_up,bat->bat_name, len) ? + return copy_to_user(name_up, bat->bat_name, len) ? -EFAULT: 0; } } @@ -1977,7 +1977,7 @@ out: } srpc_service_t lstcon_acceptor_service; -void lstcon_init_acceptor_service(void) +static void lstcon_init_acceptor_service(void) { /* initialize selftest console acceptor service table */ lstcon_acceptor_service.sv_name = "join session"; diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c index 7e83dff2fcb..df04ab7de83 100644 --- a/drivers/staging/lustre/lnet/selftest/framework.c +++ b/drivers/staging/lustre/lnet/selftest/framework.c @@ -1286,7 +1286,7 @@ sfw_handle_server_rpc(struct srpc_server_rpc *rpc) goto out; } - switch(sv->sv_id) { + switch (sv->sv_id) { default: LBUG (); case SRPC_SERVICE_TEST: @@ -1592,8 +1592,7 @@ sfw_post_rpc (srpc_client_rpc_t *rpc) return; } -static srpc_service_t sfw_services[] = -{ +static srpc_service_t sfw_services[] = { { /* sv_id */ SRPC_SERVICE_DEBUG, /* sv_name */ "debug", |