From: Alex Elder Date: Wed, 30 May 2012 02:47:38 +0000 (-0500) Subject: libceph: kill bad_proto ceph connection op X-Git-Tag: v3.4.20~79 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=809c58f1bd5fa3d3e9ff1d3614c00c1a1239abf1;p=karo-tx-linux.git libceph: kill bad_proto ceph connection op (cherry picked from commit 6384bb8b8e88a9c6bf2ae0d9517c2c0199177c34) No code sets a bad_proto method in its ceph connection operations vector, so just get rid of it. Signed-off-by: Alex Elder Reviewed-by: Yehuda Sadeh Signed-off-by: Greg Kroah-Hartman --- diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h index 6a1dc80cf1e7..ce7a4830529d 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 4054adb66513..b408ea7cce96 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -1360,11 +1360,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)