Commit f2199625 authored by Lance Roy's avatar Lance Roy Committed by Greg Kroah-Hartman
Browse files

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: default avatarLance Roy <ldr709@gmail.com>
Cc: Cliff Whickman <cpw@sgi.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Acked-by: default avatarRobin Holt <robinmholt@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3b7584a2

drivers/misc/sgi-xp/xpc_channel.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/misc/sgi-xp/xpc_sn2.c

+1 −1
Original line number Diff line number Diff line
@@ -1671,7 +1671,7 @@ xpc_teardown_msg_structures_sn2(struct xpc_channel *ch) 
{

	struct xpc_channel_sn2 *ch_sn2 = &ch->sn.sn2;



	DBUG_ON(!spin_is_locked(&ch->lock));

	lockdep_assert_held(&ch->lock);



	ch_sn2->remote_msgqueue_pa = 0;

drivers/misc/sgi-xp/xpc_uv.c

+1 −1
Original line number Diff line number Diff line
@@ -1183,7 +1183,7 @@ xpc_teardown_msg_structures_uv(struct xpc_channel *ch) 
{

	struct xpc_channel_uv *ch_uv = &ch->sn.uv;



	DBUG_ON(!spin_is_locked(&ch->lock));

	lockdep_assert_held(&ch->lock);



	kfree(ch_uv->cached_notify_gru_mq_desc);

	ch_uv->cached_notify_gru_mq_desc = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE