Commit ae8509c4 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by David S. Miller

tipc: cosmetic realignment of function arguments

No runtime code changes here.  Just a realign of the function
arguments to start where the 1st one was, and fit as many args
as can be put in an 80 char line.
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c0fee8ac
...@@ -578,8 +578,7 @@ u32 tipc_bclink_acks_missing(struct tipc_node *n_ptr) ...@@ -578,8 +578,7 @@ u32 tipc_bclink_acks_missing(struct tipc_node *n_ptr)
* Returns 0 (packet sent successfully) under all circumstances, * Returns 0 (packet sent successfully) under all circumstances,
* since the broadcast link's pseudo-bearer never blocks * since the broadcast link's pseudo-bearer never blocks
*/ */
static int tipc_bcbearer_send(struct sk_buff *buf, static int tipc_bcbearer_send(struct sk_buff *buf, struct tipc_bearer *unused1,
struct tipc_bearer *unused1,
struct tipc_media_addr *unused2) struct tipc_media_addr *unused2)
{ {
int bp_index; int bp_index;
......
...@@ -75,7 +75,8 @@ void tipc_nmap_remove(struct tipc_node_map *nm_ptr, u32 node); ...@@ -75,7 +75,8 @@ void tipc_nmap_remove(struct tipc_node_map *nm_ptr, u32 node);
/** /**
* tipc_nmap_equal - test for equality of node maps * tipc_nmap_equal - test for equality of node maps
*/ */
static inline int tipc_nmap_equal(struct tipc_node_map *nm_a, struct tipc_node_map *nm_b) static inline int tipc_nmap_equal(struct tipc_node_map *nm_a,
struct tipc_node_map *nm_b)
{ {
return !memcmp(nm_a, nm_b, sizeof(*nm_a)); return !memcmp(nm_a, nm_b, sizeof(*nm_a));
} }
......
...@@ -70,8 +70,7 @@ struct tipc_link_req { ...@@ -70,8 +70,7 @@ struct tipc_link_req {
* @dest_domain: network domain of node(s) which should respond to message * @dest_domain: network domain of node(s) which should respond to message
* @b_ptr: ptr to bearer issuing message * @b_ptr: ptr to bearer issuing message
*/ */
static struct sk_buff *tipc_disc_init_msg(u32 type, static struct sk_buff *tipc_disc_init_msg(u32 type, u32 dest_domain,
u32 dest_domain,
struct tipc_bearer *b_ptr) struct tipc_bearer *b_ptr)
{ {
struct sk_buff *buf = tipc_buf_acquire(INT_H_SIZE); struct sk_buff *buf = tipc_buf_acquire(INT_H_SIZE);
...@@ -346,8 +345,8 @@ static void disc_timeout(struct tipc_link_req *req) ...@@ -346,8 +345,8 @@ static void disc_timeout(struct tipc_link_req *req)
* *
* Returns 0 if successful, otherwise -errno. * Returns 0 if successful, otherwise -errno.
*/ */
int tipc_disc_create(struct tipc_bearer *b_ptr, int tipc_disc_create(struct tipc_bearer *b_ptr, struct tipc_media_addr *dest,
struct tipc_media_addr *dest, u32 dest_domain) u32 dest_domain)
{ {
struct tipc_link_req *req; struct tipc_link_req *req;
......
...@@ -771,8 +771,7 @@ static void link_state_event(struct tipc_link *l_ptr, unsigned int event) ...@@ -771,8 +771,7 @@ static void link_state_event(struct tipc_link *l_ptr, unsigned int event)
* link_bundle_buf(): Append contents of a buffer to * link_bundle_buf(): Append contents of a buffer to
* the tail of an existing one. * the tail of an existing one.
*/ */
static int link_bundle_buf(struct tipc_link *l_ptr, static int link_bundle_buf(struct tipc_link *l_ptr, struct sk_buff *bundler,
struct sk_buff *bundler,
struct sk_buff *buf) struct sk_buff *buf)
{ {
struct tipc_msg *bundler_msg = buf_msg(bundler); struct tipc_msg *bundler_msg = buf_msg(bundler);
...@@ -1064,8 +1063,7 @@ static int link_send_buf_fast(struct tipc_link *l_ptr, struct sk_buff *buf, ...@@ -1064,8 +1063,7 @@ static int link_send_buf_fast(struct tipc_link *l_ptr, struct sk_buff *buf,
*/ */
int tipc_link_send_sections_fast(struct tipc_port *sender, int tipc_link_send_sections_fast(struct tipc_port *sender,
struct iovec const *msg_sect, struct iovec const *msg_sect,
const u32 num_sect, const u32 num_sect, unsigned int total_len,
unsigned int total_len,
u32 destaddr) u32 destaddr)
{ {
struct tipc_msg *hdr = &sender->phdr; struct tipc_msg *hdr = &sender->phdr;
...@@ -1155,8 +1153,7 @@ int tipc_link_send_sections_fast(struct tipc_port *sender, ...@@ -1155,8 +1153,7 @@ int tipc_link_send_sections_fast(struct tipc_port *sender,
*/ */
static int link_send_sections_long(struct tipc_port *sender, static int link_send_sections_long(struct tipc_port *sender,
struct iovec const *msg_sect, struct iovec const *msg_sect,
u32 num_sect, u32 num_sect, unsigned int total_len,
unsigned int total_len,
u32 destaddr) u32 destaddr)
{ {
struct tipc_link *l_ptr; struct tipc_link *l_ptr;
...@@ -2107,8 +2104,7 @@ static void link_recv_proto_msg(struct tipc_link *l_ptr, struct sk_buff *buf) ...@@ -2107,8 +2104,7 @@ static void link_recv_proto_msg(struct tipc_link *l_ptr, struct sk_buff *buf)
* another bearer. Owner node is locked. * another bearer. Owner node is locked.
*/ */
static void tipc_link_tunnel(struct tipc_link *l_ptr, static void tipc_link_tunnel(struct tipc_link *l_ptr,
struct tipc_msg *tunnel_hdr, struct tipc_msg *tunnel_hdr, struct tipc_msg *msg,
struct tipc_msg *msg,
u32 selector) u32 selector)
{ {
struct tipc_link *tunnel; struct tipc_link *tunnel;
......
...@@ -51,8 +51,8 @@ u32 tipc_msg_tot_importance(struct tipc_msg *m) ...@@ -51,8 +51,8 @@ u32 tipc_msg_tot_importance(struct tipc_msg *m)
} }
void tipc_msg_init(struct tipc_msg *m, u32 user, u32 type, void tipc_msg_init(struct tipc_msg *m, u32 user, u32 type, u32 hsize,
u32 hsize, u32 destnode) u32 destnode)
{ {
memset(m, 0, hsize); memset(m, 0, hsize);
msg_set_version(m); msg_set_version(m);
......
...@@ -719,8 +719,8 @@ static inline void msg_set_link_tolerance(struct tipc_msg *m, u32 n) ...@@ -719,8 +719,8 @@ static inline void msg_set_link_tolerance(struct tipc_msg *m, u32 n)
} }
u32 tipc_msg_tot_importance(struct tipc_msg *m); u32 tipc_msg_tot_importance(struct tipc_msg *m);
void tipc_msg_init(struct tipc_msg *m, u32 user, u32 type, void tipc_msg_init(struct tipc_msg *m, u32 user, u32 type, u32 hsize,
u32 hsize, u32 destnode); u32 destnode);
int tipc_msg_build(struct tipc_msg *hdr, struct iovec const *msg_sect, int tipc_msg_build(struct tipc_msg *hdr, struct iovec const *msg_sect,
u32 num_sect, unsigned int total_len, int max_size, u32 num_sect, unsigned int total_len, int max_size,
struct sk_buff **buf); struct sk_buff **buf);
......
...@@ -92,9 +92,10 @@ struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper, ...@@ -92,9 +92,10 @@ struct publication *tipc_nametbl_publish(u32 type, u32 lower, u32 upper,
u32 scope, u32 port_ref, u32 key); u32 scope, u32 port_ref, u32 key);
int tipc_nametbl_withdraw(u32 type, u32 lower, u32 ref, u32 key); int tipc_nametbl_withdraw(u32 type, u32 lower, u32 ref, u32 key);
struct publication *tipc_nametbl_insert_publ(u32 type, u32 lower, u32 upper, struct publication *tipc_nametbl_insert_publ(u32 type, u32 lower, u32 upper,
u32 scope, u32 node, u32 ref, u32 key); u32 scope, u32 node, u32 ref,
struct publication *tipc_nametbl_remove_publ(u32 type, u32 lower, u32 key);
u32 node, u32 ref, u32 key); struct publication *tipc_nametbl_remove_publ(u32 type, u32 lower, u32 node,
u32 ref, u32 key);
void tipc_nametbl_subscribe(struct tipc_subscription *s); void tipc_nametbl_subscribe(struct tipc_subscription *s);
void tipc_nametbl_unsubscribe(struct tipc_subscription *s); void tipc_nametbl_unsubscribe(struct tipc_subscription *s);
int tipc_nametbl_init(void); int tipc_nametbl_init(void);
......
...@@ -207,7 +207,8 @@ void tipc_port_recv_mcast(struct sk_buff *buf, struct tipc_port_list *dp) ...@@ -207,7 +207,8 @@ void tipc_port_recv_mcast(struct sk_buff *buf, struct tipc_port_list *dp)
* Returns pointer to (locked) TIPC port, or NULL if unable to create it * Returns pointer to (locked) TIPC port, or NULL if unable to create it
*/ */
struct tipc_port *tipc_createport(struct sock *sk, struct tipc_port *tipc_createport(struct sock *sk,
u32 (*dispatcher)(struct tipc_port *, struct sk_buff *), u32 (*dispatcher)(struct tipc_port *,
struct sk_buff *),
void (*wakeup)(struct tipc_port *), void (*wakeup)(struct tipc_port *),
const u32 importance) const u32 importance)
{ {
......
...@@ -107,8 +107,10 @@ struct tipc_port_list; ...@@ -107,8 +107,10 @@ struct tipc_port_list;
* TIPC port manipulation routines * TIPC port manipulation routines
*/ */
struct tipc_port *tipc_createport(struct sock *sk, struct tipc_port *tipc_createport(struct sock *sk,
u32 (*dispatcher)(struct tipc_port *, struct sk_buff *), u32 (*dispatcher)(struct tipc_port *,
void (*wakeup)(struct tipc_port *), const u32 importance); struct sk_buff *),
void (*wakeup)(struct tipc_port *),
const u32 importance);
int tipc_reject_msg(struct sk_buff *buf, u32 err); int tipc_reject_msg(struct sk_buff *buf, u32 err);
......
...@@ -1736,8 +1736,8 @@ static int shutdown(struct socket *sock, int how) ...@@ -1736,8 +1736,8 @@ static int shutdown(struct socket *sock, int how)
* *
* Returns 0 on success, errno otherwise * Returns 0 on success, errno otherwise
*/ */
static int setsockopt(struct socket *sock, static int setsockopt(struct socket *sock, int lvl, int opt, char __user *ov,
int lvl, int opt, char __user *ov, unsigned int ol) unsigned int ol)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct tipc_port *tport = tipc_sk_port(sk); struct tipc_port *tport = tipc_sk_port(sk);
...@@ -1795,8 +1795,8 @@ static int setsockopt(struct socket *sock, ...@@ -1795,8 +1795,8 @@ static int setsockopt(struct socket *sock,
* *
* Returns 0 on success, errno otherwise * Returns 0 on success, errno otherwise
*/ */
static int getsockopt(struct socket *sock, static int getsockopt(struct socket *sock, int lvl, int opt, char __user *ov,
int lvl, int opt, char __user *ov, int __user *ol) int __user *ol)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct tipc_port *tport = tipc_sk_port(sk); struct tipc_port *tport = tipc_sk_port(sk);
......
...@@ -117,10 +117,8 @@ static void subscr_send_event(struct tipc_subscription *sub, u32 found_lower, ...@@ -117,10 +117,8 @@ static void subscr_send_event(struct tipc_subscription *sub, u32 found_lower,
* *
* Returns 1 if there is overlap, otherwise 0. * Returns 1 if there is overlap, otherwise 0.
*/ */
int tipc_subscr_overlap(struct tipc_subscription *sub, int tipc_subscr_overlap(struct tipc_subscription *sub, u32 found_lower,
u32 found_lower,
u32 found_upper) u32 found_upper)
{ {
if (found_lower < sub->seq.lower) if (found_lower < sub->seq.lower)
found_lower = sub->seq.lower; found_lower = sub->seq.lower;
...@@ -136,13 +134,9 @@ int tipc_subscr_overlap(struct tipc_subscription *sub, ...@@ -136,13 +134,9 @@ int tipc_subscr_overlap(struct tipc_subscription *sub,
* *
* Protected by nameseq.lock in name_table.c * Protected by nameseq.lock in name_table.c
*/ */
void tipc_subscr_report_overlap(struct tipc_subscription *sub, void tipc_subscr_report_overlap(struct tipc_subscription *sub, u32 found_lower,
u32 found_lower, u32 found_upper, u32 event, u32 port_ref,
u32 found_upper, u32 node, int must)
u32 event,
u32 port_ref,
u32 node,
int must)
{ {
if (!tipc_subscr_overlap(sub, found_lower, found_upper)) if (!tipc_subscr_overlap(sub, found_lower, found_upper))
return; return;
......
...@@ -67,17 +67,12 @@ struct tipc_subscription { ...@@ -67,17 +67,12 @@ struct tipc_subscription {
struct tipc_event evt; struct tipc_event evt;
}; };
int tipc_subscr_overlap(struct tipc_subscription *sub, int tipc_subscr_overlap(struct tipc_subscription *sub, u32 found_lower,
u32 found_lower,
u32 found_upper); u32 found_upper);
void tipc_subscr_report_overlap(struct tipc_subscription *sub, void tipc_subscr_report_overlap(struct tipc_subscription *sub, u32 found_lower,
u32 found_lower, u32 found_upper, u32 event, u32 port_ref,
u32 found_upper, u32 node, int must);
u32 event,
u32 port_ref,
u32 node,
int must_report);
int tipc_subscr_start(void); int tipc_subscr_start(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment