Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/pcmcia/pcnet_cs.c net/caif/caif_socket.c
This commit is contained in:
@@ -745,17 +745,18 @@ gss_pipe_release(struct inode *inode)
|
||||
struct rpc_inode *rpci = RPC_I(inode);
|
||||
struct gss_upcall_msg *gss_msg;
|
||||
|
||||
restart:
|
||||
spin_lock(&inode->i_lock);
|
||||
while (!list_empty(&rpci->in_downcall)) {
|
||||
list_for_each_entry(gss_msg, &rpci->in_downcall, list) {
|
||||
|
||||
gss_msg = list_entry(rpci->in_downcall.next,
|
||||
struct gss_upcall_msg, list);
|
||||
if (!list_empty(&gss_msg->msg.list))
|
||||
continue;
|
||||
gss_msg->msg.errno = -EPIPE;
|
||||
atomic_inc(&gss_msg->count);
|
||||
__gss_unhash_msg(gss_msg);
|
||||
spin_unlock(&inode->i_lock);
|
||||
gss_release_msg(gss_msg);
|
||||
spin_lock(&inode->i_lock);
|
||||
goto restart;
|
||||
}
|
||||
spin_unlock(&inode->i_lock);
|
||||
|
||||
|
Reference in New Issue
Block a user