diff options
| author | Alex Elder <elder@inktank.com> | 2012-05-30 06:47:38 +0400 |
|---|---|---|
| committer | Alex Elder <elder@dreamhost.com> | 2012-06-01 17:37:55 +0400 |
| commit | 6384bb8b8e88a9c6bf2ae0d9517c2c0199177c34 (patch) | |
| tree | 1f01bca1df2e7bfaed20654dfc6d483be4d7c2cd | |
| parent | e5e372da9a469dfe3ece40277090a7056c566838 (diff) | |
| download | linux-6384bb8b8e88a9c6bf2ae0d9517c2c0199177c34.tar.xz | |
libceph: kill bad_proto ceph connection op
No code sets a bad_proto method in its ceph connection operations
vector, so just get rid of it.
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
| -rw-r--r-- | include/linux/ceph/messenger.h | 3 | ||||
| -rw-r--r-- | net/ceph/messenger.c | 5 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h index aa506cadea67..74f6c9bd8074 100644 --- a/include/linux/ceph/messenger.h +++ b/include/linux/ceph/messenger.h @@ -31,9 +31,6 @@ struct ceph_connection_operations { int (*verify_authorizer_reply) (struct ceph_connection *con, int len); int (*invalidate_authorizer)(struct ceph_connection *con); - /* protocol version mismatch */ - void (*bad_proto) (struct ceph_connection *con); - /* there was some error on the socket (disconnect, whatever) */ void (*fault) (struct ceph_connection *con); diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 42ca8aab6dcf..07af9948e3f7 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -1356,11 +1356,6 @@ static void fail_protocol(struct ceph_connection *con) { reset_connection(con); set_bit(CLOSED, &con->state); /* in case there's queued work */ - - mutex_unlock(&con->mutex); - if (con->ops->bad_proto) - con->ops->bad_proto(con); - mutex_lock(&con->mutex); } static int process_connect(struct ceph_connection *con) |