Skip to content

Commit

Permalink
[PATCH] iseries_veth: Remove redundant message stack lock
Browse files Browse the repository at this point in the history
The iseries_veth driver keeps a stack of messages for each connection
and a lock to protect the stack. However there is also a per-connection lock
which makes the message stack lock redundant.

Remove the message stack lock and document the fact that callers of the
stack-manipulation functions must hold the connection's lock.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
  • Loading branch information
Michael Ellerman authored and Jeff Garzik committed Sep 1, 2005
1 parent 2a5391a commit d7893dd
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions drivers/net/iseries_veth.c
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ struct veth_lpar_connection {
struct VethCapData remote_caps;
u32 ack_timeout;

spinlock_t msg_stack_lock;
struct veth_msg *msg_stack_head;
};

Expand Down Expand Up @@ -190,27 +189,23 @@ static void veth_timed_ack(unsigned long connectionPtr);
#define veth_debug(fmt, args...) do {} while (0)
#endif

/* You must hold the connection's lock when you call this function. */
static inline void veth_stack_push(struct veth_lpar_connection *cnx,
struct veth_msg *msg)
{
unsigned long flags;

spin_lock_irqsave(&cnx->msg_stack_lock, flags);
msg->next = cnx->msg_stack_head;
cnx->msg_stack_head = msg;
spin_unlock_irqrestore(&cnx->msg_stack_lock, flags);
}

/* You must hold the connection's lock when you call this function. */
static inline struct veth_msg *veth_stack_pop(struct veth_lpar_connection *cnx)
{
unsigned long flags;
struct veth_msg *msg;

spin_lock_irqsave(&cnx->msg_stack_lock, flags);
msg = cnx->msg_stack_head;
if (msg)
cnx->msg_stack_head = cnx->msg_stack_head->next;
spin_unlock_irqrestore(&cnx->msg_stack_lock, flags);

return msg;
}

Expand Down Expand Up @@ -645,7 +640,6 @@ static int veth_init_connection(u8 rlp)

cnx->msgs = msgs;
memset(msgs, 0, VETH_NUMBUFFERS * sizeof(struct veth_msg));
spin_lock_init(&cnx->msg_stack_lock);

for (i = 0; i < VETH_NUMBUFFERS; i++) {
msgs[i].token = i;
Expand Down

0 comments on commit d7893dd

Please sign in to comment.