korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 05:34:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ATM]: Use SEQ_START_TOKEN

Browse Source 
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2008-04-10 03:33:03 -07:00 committed by David S. Miller
parent 4dfc281702
commit 2e1e9848ac
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/atm/lec.c
View File

@ -1014,7 +1014,7 @@ static void *lec_tbl_walk(struct lec_state *state, struct hlist_head *tbl,
if (!e) if (!e)
e = tbl->first; e = tbl->first;
if (e == (void *)1) { if (e == SEQ_START_TOKEN) {
e = tbl->first; e = tbl->first;
--*l; --*l;
} }
@ -1116,9 +1116,9 @@ static void *lec_seq_start(struct seq_file *seq, loff_t *pos)
state->locked = NULL; state->locked = NULL;
state->arp_table = 0; state->arp_table = 0;
state->misc_table = 0; state->misc_table = 0;
state->node = (void *)1; state->node = SEQ_START_TOKEN;
return *pos ? lec_get_idx(state, *pos) : (void *)1; return *pos ? lec_get_idx(state, *pos) : SEQ_START_TOKEN;
} }
static void lec_seq_stop(struct seq_file *seq, void *v) static void lec_seq_stop(struct seq_file *seq, void *v)
@ -1147,7 +1147,7 @@ static int lec_seq_show(struct seq_file *seq, void *v)
" Status Flags " " Status Flags "
"VPI/VCI Recv VPI/VCI\n"; "VPI/VCI Recv VPI/VCI\n";
if (v == (void *)1) if (v == SEQ_START_TOKEN)
seq_puts(seq, lec_banner); seq_puts(seq, lec_banner);
else { else {
struct lec_state *state = seq->private; struct lec_state *state = seq->private;

16
net/atm/proc.c
View File

@ -78,7 +78,7 @@ static int __vcc_walk(struct sock **sock, int family, int *bucket, loff_t l)
{ {
struct sock *sk = *sock; struct sock *sk = *sock;
if (sk == (void *)1) { if (sk == SEQ_START_TOKEN) {
for (*bucket = 0; *bucket < VCC_HTABLE_SIZE; ++*bucket) { for (*bucket = 0; *bucket < VCC_HTABLE_SIZE; ++*bucket) {
struct hlist_head *head = &vcc_hash[*bucket]; struct hlist_head *head = &vcc_hash[*bucket];
@ -98,7 +98,7 @@ try_again:
sk = sk_head(&vcc_hash[*bucket]); sk = sk_head(&vcc_hash[*bucket]);
goto try_again; goto try_again;
} }
sk = (void *)1; sk = SEQ_START_TOKEN;
out: out:
*sock = sk; *sock = sk;
return (l < 0); return (l < 0);
@ -130,8 +130,8 @@ static void *vcc_seq_start(struct seq_file *seq, loff_t *pos)
loff_t left = *pos; loff_t left = *pos;
read_lock(&vcc_sklist_lock); read_lock(&vcc_sklist_lock);
state->sk = (void *)1; state->sk = SEQ_START_TOKEN;
return left ? vcc_walk(state, left) : (void *)1; return left ? vcc_walk(state, left) : SEQ_START_TOKEN;
} }
static void vcc_seq_stop(struct seq_file *seq, void *v) static void vcc_seq_stop(struct seq_file *seq, void *v)
@ -235,7 +235,7 @@ static int atm_dev_seq_show(struct seq_file *seq, void *v)
"Itf Type ESI/\"MAC\"addr " "Itf Type ESI/\"MAC\"addr "
"AAL(TX,err,RX,err,drop) ... [refcnt]\n"; "AAL(TX,err,RX,err,drop) ... [refcnt]\n";
if (v == (void *)1) if (v == SEQ_START_TOKEN)
seq_puts(seq, atm_dev_banner); seq_puts(seq, atm_dev_banner);
else { else {
struct atm_dev *dev = list_entry(v, struct atm_dev, dev_list); struct atm_dev *dev = list_entry(v, struct atm_dev, dev_list);
@ -269,7 +269,7 @@ static int pvc_seq_show(struct seq_file *seq, void *v)
static char atm_pvc_banner[] = static char atm_pvc_banner[] =
"Itf VPI VCI AAL RX(PCR,Class) TX(PCR,Class)\n"; "Itf VPI VCI AAL RX(PCR,Class) TX(PCR,Class)\n";
if (v == (void *)1) if (v == SEQ_START_TOKEN)
seq_puts(seq, atm_pvc_banner); seq_puts(seq, atm_pvc_banner);
else { else {
struct vcc_state *state = seq->private; struct vcc_state *state = seq->private;
@ -301,7 +301,7 @@ static const struct file_operations pvc_seq_fops = {
static int vcc_seq_show(struct seq_file *seq, void *v) static int vcc_seq_show(struct seq_file *seq, void *v)
{ {
if (v == (void *)1) { if (v == SEQ_START_TOKEN) {
seq_printf(seq, sizeof(void *) == 4 ? "%-8s%s" : "%-16s%s", seq_printf(seq, sizeof(void *) == 4 ? "%-8s%s" : "%-16s%s",
"Address ", "Itf VPI VCI Fam Flags Reply " "Address ", "Itf VPI VCI Fam Flags Reply "
"Send buffer Recv buffer [refcnt]\n"); "Send buffer Recv buffer [refcnt]\n");
@ -338,7 +338,7 @@ static int svc_seq_show(struct seq_file *seq, void *v)
static char atm_svc_banner[] = static char atm_svc_banner[] =
"Itf VPI VCI State Remote\n"; "Itf VPI VCI State Remote\n";
if (v == (void *)1) if (v == SEQ_START_TOKEN)
seq_puts(seq, atm_svc_banner); seq_puts(seq, atm_svc_banner);
else { else {
struct vcc_state *state = seq->private; struct vcc_state *state = seq->private;

5
net/atm/resources.c
View File

@ -415,7 +415,7 @@ static __inline__ void *dev_get_idx(loff_t left)
void *atm_dev_seq_start(struct seq_file *seq, loff_t *pos) void *atm_dev_seq_start(struct seq_file *seq, loff_t *pos)
{ {
mutex_lock(&atm_dev_mutex); mutex_lock(&atm_dev_mutex);
return *pos ? dev_get_idx(*pos) : (void *) 1; return *pos ? dev_get_idx(*pos) : SEQ_START_TOKEN;
} }
void atm_dev_seq_stop(struct seq_file *seq, void *v) void atm_dev_seq_stop(struct seq_file *seq, void *v)
@ -426,7 +426,8 @@ void atm_dev_seq_stop(struct seq_file *seq, void *v)
void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos) void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)
{ {
++*pos; ++*pos;
v = (v == (void *)1) ? atm_devs.next : ((struct list_head *)v)->next; v = (v == SEQ_START_TOKEN)
? atm_devs.next : ((struct list_head *)v)->next;
return (v == &atm_devs) ? NULL : v; return (v == &atm_devs) ? NULL : v;
} }