Skip to content

Commit

Permalink
tipc: rename struct subscription to struct tipc_subscription
Browse files Browse the repository at this point in the history 
Make this rename so that it is consistent with the majority
of the other tipc structs and to assist in removing any
ambiguity with other similar names in other subsystems.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
  • Loading branch information
Paul Gortmaker committed Dec 30, 2011
1 parent 4584310 commit fead390
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 26 deletions.
13 changes: 7 additions & 6 deletions net/tipc/name_table.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,8 @@ static struct publication *tipc_nameseq_insert_publ(struct name_seq *nseq,
u32 type, u32 lower, u32 upper,
u32 scope, u32 node, u32 port, u32 key)
{
struct subscription *s;
struct subscription *st;
struct tipc_subscription *s;
struct tipc_subscription *st;
struct publication *publ;
struct sub_seq *sseq;
struct name_info *info;
Expand Down Expand Up @@ -381,7 +381,7 @@ static struct publication *tipc_nameseq_remove_publ(struct name_seq *nseq, u32 i
struct sub_seq *sseq = nameseq_find_subseq(nseq, inst);
struct name_info *info;
struct sub_seq *free;
struct subscription *s, *st;
struct tipc_subscription *s, *st;
int removed_subseq = 0;

if (!sseq)
Expand Down Expand Up @@ -448,7 +448,8 @@ static struct publication *tipc_nameseq_remove_publ(struct name_seq *nseq, u32 i
* sequence overlapping with the requested sequence
*/

static void tipc_nameseq_subscribe(struct name_seq *nseq, struct subscription *s)
static void tipc_nameseq_subscribe(struct name_seq *nseq,
struct tipc_subscription *s)
{
struct sub_seq *sseq = nseq->sseqs;

Expand Down Expand Up @@ -739,7 +740,7 @@ int tipc_nametbl_withdraw(u32 type, u32 lower, u32 ref, u32 key)
* tipc_nametbl_subscribe - add a subscription object to the name table
*/

void tipc_nametbl_subscribe(struct subscription *s)
void tipc_nametbl_subscribe(struct tipc_subscription *s)
{
u32 type = s->seq.type;
struct name_seq *seq;
Expand All @@ -763,7 +764,7 @@ void tipc_nametbl_subscribe(struct subscription *s)
* tipc_nametbl_unsubscribe - remove a subscription object from name table
*/

void tipc_nametbl_unsubscribe(struct subscription *s)
void tipc_nametbl_unsubscribe(struct tipc_subscription *s)
{
struct name_seq *seq;

Expand Down
6 changes: 3 additions & 3 deletions net/tipc/name_table.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

#include "node_subscr.h"

struct subscription;
struct tipc_subscription;
struct tipc_port_list;

/*
Expand Down Expand Up @@ -100,8 +100,8 @@ struct publication *tipc_nametbl_insert_publ(u32 type, u32 lower, u32 upper,
u32 scope, 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 subscription *s);
void tipc_nametbl_unsubscribe(struct subscription *s);
void tipc_nametbl_subscribe(struct tipc_subscription *s);
void tipc_nametbl_unsubscribe(struct tipc_subscription *s);
int tipc_nametbl_init(void);
void tipc_nametbl_stop(void);

Expand Down
24 changes: 12 additions & 12 deletions net/tipc/subscr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ static u32 htohl(u32 in, int swap)
* try to take the lock if the message is rejected and returned!
*/

static void subscr_send_event(struct subscription *sub,
static void subscr_send_event(struct tipc_subscription *sub,
u32 found_lower,
u32 found_upper,
u32 event,
Expand All @@ -118,7 +118,7 @@ static void subscr_send_event(struct subscription *sub,
* Returns 1 if there is overlap, otherwise 0.
*/

int tipc_subscr_overlap(struct subscription *sub,
int tipc_subscr_overlap(struct tipc_subscription *sub,
u32 found_lower,
u32 found_upper)

Expand All @@ -138,7 +138,7 @@ int tipc_subscr_overlap(struct subscription *sub,
* Protected by nameseq.lock in name_table.c
*/

void tipc_subscr_report_overlap(struct subscription *sub,
void tipc_subscr_report_overlap(struct tipc_subscription *sub,
u32 found_lower,
u32 found_upper,
u32 event,
Expand All @@ -158,7 +158,7 @@ void tipc_subscr_report_overlap(struct subscription *sub,
* subscr_timeout - subscription timeout has occurred
*/

static void subscr_timeout(struct subscription *sub)
static void subscr_timeout(struct tipc_subscription *sub)
{
struct tipc_port *server_port;

Expand Down Expand Up @@ -205,7 +205,7 @@ static void subscr_timeout(struct subscription *sub)
* Called with subscriber port locked.
*/

static void subscr_del(struct subscription *sub)
static void subscr_del(struct tipc_subscription *sub)
{
tipc_nametbl_unsubscribe(sub);
list_del(&sub->subscription_list);
Expand All @@ -227,8 +227,8 @@ static void subscr_del(struct subscription *sub)
static void subscr_terminate(struct subscriber *subscriber)
{
u32 port_ref;
struct subscription *sub;
struct subscription *sub_temp;
struct tipc_subscription *sub;
struct tipc_subscription *sub_temp;

/* Invalidate subscriber reference */

Expand Down Expand Up @@ -280,8 +280,8 @@ static void subscr_terminate(struct subscriber *subscriber)
static void subscr_cancel(struct tipc_subscr *s,
struct subscriber *subscriber)
{
struct subscription *sub;
struct subscription *sub_temp;
struct tipc_subscription *sub;
struct tipc_subscription *sub_temp;
int found = 0;

/* Find first matching subscription, exit if not found */
Expand Down Expand Up @@ -314,10 +314,10 @@ static void subscr_cancel(struct tipc_subscr *s,
* Called with subscriber port locked.
*/

static struct subscription *subscr_subscribe(struct tipc_subscr *s,
static struct tipc_subscription *subscr_subscribe(struct tipc_subscr *s,
struct subscriber *subscriber)
{
struct subscription *sub;
struct tipc_subscription *sub;
int swap;

/* Determine subscriber's endianness */
Expand Down Expand Up @@ -418,7 +418,7 @@ static void subscr_conn_msg_event(void *usr_handle,
{
struct subscriber *subscriber = usr_handle;
spinlock_t *subscriber_lock;
struct subscription *sub;
struct tipc_subscription *sub;

/*
* Lock subscriber's server port (& make a local copy of lock pointer,
Expand Down
10 changes: 5 additions & 5 deletions net/tipc/subscr.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
#ifndef _TIPC_SUBSCR_H
#define _TIPC_SUBSCR_H

struct subscription;
struct tipc_subscription;

/**
* struct subscription - TIPC network topology subscription object
* struct tipc_subscription - TIPC network topology subscription object
* @seq: name sequence associated with subscription
* @timeout: duration of subscription (in ms)
* @filter: event filtering to be done for subscription
Expand All @@ -52,7 +52,7 @@ struct subscription;
* @evt: template for events generated by subscription
*/

struct subscription {
struct tipc_subscription {
struct tipc_name_seq seq;
u32 timeout;
u32 filter;
Expand All @@ -64,11 +64,11 @@ struct subscription {
struct tipc_event evt;
};

int tipc_subscr_overlap(struct subscription *sub,
int tipc_subscr_overlap(struct tipc_subscription *sub,
u32 found_lower,
u32 found_upper);

void tipc_subscr_report_overlap(struct subscription *sub,
void tipc_subscr_report_overlap(struct tipc_subscription *sub,
u32 found_lower,
u32 found_upper,
u32 event,
Expand Down

0 comments on commit fead390

Please sign in to comment.