diff options
| author |   Andy Grover <andy.grover@oracle.com> | 2009-04-01 08:20:20 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-04-02 00:52:22 -0700 |
| commit | 8cbd9606a6367c221a7bbcc47f3ab1a8c31b6437 (patch) | |
| tree | 9ff2adf88be32383fd59dc133f1cd6670b9ee815 /net/rds/iw_cm.c | |
| parent | RDS: Rewrite connection cleanup, fixing oops on rmmod (diff) | |
| download | linux-dev-8cbd9606a6367c221a7bbcc47f3ab1a8c31b6437.tar.xz linux-dev-8cbd9606a6367c221a7bbcc47f3ab1a8c31b6437.zip | |
RDS: Use spinlock to protect 64b value update on 32b archs
We have a 64bit value that needs to be set atomically.
This is easy and quick on all 64bit archs, and can also be done
on x86/32 with set_64bit() (uses cmpxchg8b). However other
32b archs don't have this.
I actually changed this to the current state in preparation for
mainline because the old way (using a spinlock on 32b) resulted in
unsightly #ifdefs in the code. But obviously, being correct takes
precedence.
Signed-off-by: Andy Grover <andy.grover@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds/iw_cm.c')
| -rw-r--r-- | net/rds/iw_cm.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c index 0ffaa3e97ad6..a416b0d492b1 100644 --- a/net/rds/iw_cm.c +++ b/net/rds/iw_cm.c @@ -659,7 +659,11 @@ void rds_iw_conn_shutdown(struct rds_connection *conn) /* Clear the ACK state */ clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags); - rds_iw_set_64bit(&ic->i_ack_next, 0); +#ifdef KERNEL_HAS_ATOMIC64 + atomic64_set(&ic->i_ack_next, 0); +#else + ic->i_ack_next = 0; +#endif ic->i_ack_recv = 0; /* Clear flow control state */ @@ -693,6 +697,9 @@ int rds_iw_conn_alloc(struct rds_connection *conn, gfp_t gfp) INIT_LIST_HEAD(&ic->iw_node); mutex_init(&ic->i_recv_mutex); +#ifndef KERNEL_HAS_ATOMIC64 + spin_lock_init(&ic->i_ack_lock); +#endif /* * rds_iw_conn_shutdown() waits for these to be emptied so they |