Reviewed-by: Yehuda Sadeh <[email protected]>

On Wed, May 30, 2012 at 12:34 PM, Alex Elder <[email protected]> wrote:
> No code sets a bad_proto method in its ceph connection operations
> vector, so just get rid of it.
>
> Signed-off-by: Alex Elder <[email protected]>
> ---
>  include/linux/ceph/messenger.h |    3 ---
>  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 aa506ca..74f6c9b 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 42ca8aa..07af994 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)
> --
> 1.7.5.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to [email protected]
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to