From 1e82a63709d021d1b84ff4ea06b785b2b9e93e32 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Wed, 16 Apr 2008 21:09:26 -0700 Subject: [PATCH] --- yaml --- r: 88505 b: refs/heads/master c: 157de229468b2a63bbc8f9a7d37c70a2c9731ac8 h: refs/heads/master i: 88503: a050881953dcfc3c874731ec99f78037cebf9b4c v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/fmr_pool.c | 3 +-- trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 7f9a268d317a..0cb3a4a1165d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10f32065a25d22bf7894fa39ff2ce8492922086a +refs/heads/master: 157de229468b2a63bbc8f9a7d37c70a2c9731ac8 diff --git a/trunk/drivers/infiniband/core/fmr_pool.c b/trunk/drivers/infiniband/core/fmr_pool.c index 06d502c06a4d..1286dc1b98b2 100644 --- a/trunk/drivers/infiniband/core/fmr_pool.c +++ b/trunk/drivers/infiniband/core/fmr_pool.c @@ -158,8 +158,7 @@ static void ib_fmr_batch_release(struct ib_fmr_pool *pool) #endif } - list_splice(&pool->dirty_list, &unmap_list); - INIT_LIST_HEAD(&pool->dirty_list); + list_splice_init(&pool->dirty_list, &unmap_list); pool->dirty_len = 0; spin_unlock_irq(&pool->pool_lock); diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c index 329b4675aec0..d87f53190a15 100644 --- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/trunk/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -359,8 +359,7 @@ void ipoib_flush_paths(struct net_device *dev) spin_lock_irq(&priv->tx_lock); spin_lock(&priv->lock); - list_splice(&priv->path_list, &remove_list); - INIT_LIST_HEAD(&priv->path_list); + list_splice_init(&priv->path_list, &remove_list); list_for_each_entry(path, &remove_list, list) rb_erase(&path->rb_node, &priv->path_tree);