sgi-xp: Replace spin_is_locked() with lockdep
lockdep_assert_held() is better suited to checking locking requirements, since it won't get confused when someone else holds the lock. This is also a step towards possibly removing spin_is_locked(). Signed-off-by: Lance Roy <ldr709@gmail.com> Cc: Cliff Whickman <cpw@sgi.com> Cc: Arnd Bergmann <arnd@arndb.de> Acked-by: Robin Holt <robinmholt@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
3b7584a296
commit
f21996255f
@@ -28,7 +28,7 @@ xpc_process_connect(struct xpc_channel *ch, unsigned long *irq_flags)
|
||||
{
|
||||
enum xp_retval ret;
|
||||
|
||||
DBUG_ON(!spin_is_locked(&ch->lock));
|
||||
lockdep_assert_held(&ch->lock);
|
||||
|
||||
if (!(ch->flags & XPC_C_OPENREQUEST) ||
|
||||
!(ch->flags & XPC_C_ROPENREQUEST)) {
|
||||
@@ -82,7 +82,7 @@ xpc_process_disconnect(struct xpc_channel *ch, unsigned long *irq_flags)
|
||||
struct xpc_partition *part = &xpc_partitions[ch->partid];
|
||||
u32 channel_was_connected = (ch->flags & XPC_C_WASCONNECTED);
|
||||
|
||||
DBUG_ON(!spin_is_locked(&ch->lock));
|
||||
lockdep_assert_held(&ch->lock);
|
||||
|
||||
if (!(ch->flags & XPC_C_DISCONNECTING))
|
||||
return;
|
||||
@@ -755,7 +755,7 @@ xpc_disconnect_channel(const int line, struct xpc_channel *ch,
|
||||
{
|
||||
u32 channel_was_connected = (ch->flags & XPC_C_CONNECTED);
|
||||
|
||||
DBUG_ON(!spin_is_locked(&ch->lock));
|
||||
lockdep_assert_held(&ch->lock);
|
||||
|
||||
if (ch->flags & (XPC_C_DISCONNECTING | XPC_C_DISCONNECTED))
|
||||
return;
|
||||
|
Reference in New Issue
Block a user