diff options
| author | Sage Weil <sage@inktank.com> | 2012-07-30 16:21:40 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-07-30 18:15:33 -0700 |
| commit | 5469155f2bc83bb2c88b0a0370c3d54d87eed06e (patch) | |
| tree | 2124283bd87d274ed0008f0a22711ff4f1b4982d /net/ceph | |
| parent | a53aab645c82f0146e35684b34692c69b5118121 (diff) | |
| download | linux-3.10-5469155f2bc83bb2c88b0a0370c3d54d87eed06e.tar.gz linux-3.10-5469155f2bc83bb2c88b0a0370c3d54d87eed06e.tar.bz2 linux-3.10-5469155f2bc83bb2c88b0a0370c3d54d87eed06e.zip | |
libceph: protect ceph_con_open() with mutex
Take the con mutex while we are initiating a ceph open. This is necessary
because the may have previously been in use and then closed, which could
result in a racing workqueue running con_work().
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Alex Elder <elder@inktank.com>
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/messenger.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index f1bd3bbb0c4..a4779988c84 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -537,6 +537,7 @@ void ceph_con_open(struct ceph_connection *con, __u8 entity_type, __u64 entity_num, struct ceph_entity_addr *addr) { + mutex_lock(&con->mutex); dout("con_open %p %s\n", con, ceph_pr_addr(&addr->in_addr)); set_bit(OPENING, &con->state); WARN_ON(!test_and_clear_bit(CLOSED, &con->state)); @@ -546,6 +547,7 @@ void ceph_con_open(struct ceph_connection *con, memcpy(&con->peer_addr, addr, sizeof(*addr)); con->delay = 0; /* reset backoff memory */ + mutex_unlock(&con->mutex); queue_con(con); } EXPORT_SYMBOL(ceph_con_open); |