---

yaml --- r: 196871 b: refs/heads/master c: f1ac250 h: refs/heads/master i: 196869: 1f9322c 196867: 4976325 196863: 85dcddb v: v3
git-mirror · May 21, 2010 · b29eed4 · b29eed4
1 parent 1a85856
commit b29eed4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6423104b6a1e6f0c18be60e8c33f02d263331d5e
+refs/heads/master: f1ac2502e19c59e996242d406fcc60e4c563e8ce
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
@@ -3788,7 +3788,6 @@ static void *cfq_init_queue(struct request_queue *q)
 	 * second, in order to have larger depth for async operations.
 	 */
 	cfqd->last_delayed_sync = jiffies - HZ;
-	INIT_RCU_HEAD(&cfqd->rcu);
 	return cfqd;
 }
 

diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c
@@ -988,7 +988,6 @@ int disk_expand_part_tbl(struct gendisk *disk, int partno)
 	if (!new_ptbl)
 		return -ENOMEM;
 
-	INIT_RCU_HEAD(&new_ptbl->rcu_head);
 	new_ptbl->len = target;
 
 	for (i = 0; i < len; i++)