From b29eed454437f4c66f732a042f8d375c2f31ec3e Mon Sep 17 00:00:00 2001 From: "Paul E. McKenney" Date: Wed, 19 May 2010 08:27:30 +0200 Subject: [PATCH] --- yaml --- r: 196871 b: refs/heads/master c: f1ac2502e19c59e996242d406fcc60e4c563e8ce h: refs/heads/master i: 196869: 1f9322c5cdb7878370325ae6acb229d6b6387bc3 196867: 497632587d3b96cea73d10a0d7c4aa91bc5a03bd 196863: 85dcddb21b48e32c91a2c401620a6d967a843d9c v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 1 - trunk/block/genhd.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b8c25484de09..6b8d9b62ef40 100644 --- 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 index 0f3eb70f9ce1..b1472bc2d49c 100644 --- 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 index 154b5f80b3ab..59a2db6fecef 100644 --- 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++)