Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[linux-2.6-omap-h63xx.git] / net / sctp / proc.c

diff --git a/net/sctp/proc.c b/net/sctp/proc.c
index b74f7772b576b131b34b25c33fa544d4d6b84c8d..5b3b0e0ae7e506391d22882ec0d7a91a1411800b 100644 (file)
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -69,9 +69,7 @@ fold_field(void *mib[], int nr)
        unsigned long res = 0;
        int i;
 
-       for (i = 0; i < NR_CPUS; i++) {
-               if (!cpu_possible(i))
-                       continue;
+       for_each_possible_cpu(i) {
                res +=
                    *((unsigned long *) (((void *) per_cpu_ptr(mib[0], i)) +
                                         sizeof (unsigned long) * nr));
@@ -178,7 +176,7 @@ static void sctp_seq_dump_remote_addrs(struct seq_file *seq, struct sctp_associa
 
 static void * sctp_eps_seq_start(struct seq_file *seq, loff_t *pos)
 {
-       if (*pos > sctp_ep_hashsize)
+       if (*pos >= sctp_ep_hashsize)
                return NULL;
 
        if (*pos < 0)
@@ -187,8 +185,6 @@ static void * sctp_eps_seq_start(struct seq_file *seq, loff_t *pos)
        if (*pos == 0)
                seq_printf(seq, " ENDPT     SOCK   STY SST HBKT LPORT   UID INODE LADDRS\n");
 
-       ++*pos;
-
        return (void *)pos;
 }
 
@@ -200,11 +196,9 @@ static void sctp_eps_seq_stop(struct seq_file *seq, void *v)
 
 static void * sctp_eps_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-       if (*pos > sctp_ep_hashsize)
+       if (++*pos >= sctp_ep_hashsize)
                return NULL;
 
-       ++*pos;
-
        return pos;
 }
 
@@ -216,19 +210,19 @@ static int sctp_eps_seq_show(struct seq_file *seq, void *v)
        struct sctp_ep_common *epb;
        struct sctp_endpoint *ep;
        struct sock *sk;
-       int    hash = *(int *)v;
+       int    hash = *(loff_t *)v;
 
-       if (hash > sctp_ep_hashsize)
+       if (hash >= sctp_ep_hashsize)
                return -ENOMEM;
 
-       head = &sctp_ep_hashtable[hash-1];
+       head = &sctp_ep_hashtable[hash];
        sctp_local_bh_disable();
        read_lock(&head->lock);
        for (epb = head->chain; epb; epb = epb->next) {
                ep = sctp_ep(epb);
                sk = epb->sk;
                seq_printf(seq, "%8p %8p %-3d %-3d %-4d %-5d %5d %5lu ", ep, sk,
-                          sctp_sk(sk)->type, sk->sk_state, hash-1,
+                          sctp_sk(sk)->type, sk->sk_state, hash,
                           epb->bind_addr.port,
                           sock_i_uid(sk), sock_i_ino(sk));
 
@@ -285,7 +279,7 @@ void sctp_eps_proc_exit(void)
 
 static void * sctp_assocs_seq_start(struct seq_file *seq, loff_t *pos)
 {
-       if (*pos > sctp_assoc_hashsize)
+       if (*pos >= sctp_assoc_hashsize)
                return NULL;
 
        if (*pos < 0)
@@ -295,8 +289,6 @@ static void * sctp_assocs_seq_start(struct seq_file *seq, loff_t *pos)
                seq_printf(seq, " ASSOC     SOCK   STY SST ST HBKT ASSOC-ID TX_QUEUE RX_QUEUE UID INODE LPORT "
                                "RPORT LADDRS <-> RADDRS\n");
 
-       ++*pos;
-
        return (void *)pos;
 }
 
@@ -308,11 +300,9 @@ static void sctp_assocs_seq_stop(struct seq_file *seq, void *v)
 
 static void * sctp_assocs_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-       if (*pos > sctp_assoc_hashsize)
+       if (++*pos >= sctp_assoc_hashsize)
                return NULL;
 
-       ++*pos;
-
        return pos;
 }
 
@@ -323,12 +313,12 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v)
        struct sctp_ep_common *epb;
        struct sctp_association *assoc;
        struct sock *sk;
-       int    hash = *(int *)v;
+       int    hash = *(loff_t *)v;
 
-       if (hash > sctp_assoc_hashsize)
+       if (hash >= sctp_assoc_hashsize)
                return -ENOMEM;
 
-       head = &sctp_assoc_hashtable[hash-1];
+       head = &sctp_assoc_hashtable[hash];
        sctp_local_bh_disable();
        read_lock(&head->lock);
        for (epb = head->chain; epb; epb = epb->next) {
@@ -337,7 +327,7 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v)
                seq_printf(seq,
                           "%8p %8p %-3d %-3d %-2d %-4d %4d %8d %8d %7d %5lu %-5d %5d ",
                           assoc, sk, sctp_sk(sk)->type, sk->sk_state,
-                          assoc->state, hash-1, assoc->assoc_id,
+                          assoc->state, hash, assoc->assoc_id,
                           (sk->sk_rcvbuf - assoc->rwnd),
                           assoc->sndbuf_used,
                           sock_i_uid(sk), sock_i_ino(sk),