]> git.hungrycats.org Git - linux/commit
libceph: fix protocol feature mismatch failure path
authorSage Weil <sage@inktank.com>
Fri, 28 Dec 2012 02:27:04 +0000 (20:27 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Jan 2013 16:46:48 +0000 (08:46 -0800)
commit39cebb4027204a30ba2f65befbeff1ff569d3968
tree1c68bb9a49090fa2fbeeb863ab6866b2956fd7be
parent7d70ef5bba98643d31917590bea352c9857ddbc7
libceph: fix protocol feature mismatch failure path

(cherry picked from commit 0fa6ebc600bc8e830551aee47a0e929e818a1868)

We should not set con->state to CLOSED here; that happens in
ceph_fault() in the caller, where it first asserts that the state
is not yet CLOSED.  Avoids a BUG when the features don't match.

Since the fail_protocol() has become a trivial wrapper, replace
calls to it with direct calls to reset_connection().

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Alex Elder <elder@inktank.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ceph/messenger.c