]> Pileus Git - ~andy/linux/blobdiff - block/blk-settings.c
Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/core
[~andy/linux] / block / blk-settings.c
index df649fa59ded224567387a0f34b6adfa7a1d0966..1fa7692935976f4e60393e8d7289acf1c56c74c3 100644 (file)
@@ -164,14 +164,6 @@ void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn)
        blk_queue_congestion_threshold(q);
        q->nr_batching = BLK_BATCH_REQ;
 
-       q->unplug_thresh = 4;           /* hmm */
-       q->unplug_delay = msecs_to_jiffies(3);  /* 3 milliseconds */
-       if (q->unplug_delay == 0)
-               q->unplug_delay = 1;
-
-       q->unplug_timer.function = blk_unplug_timeout;
-       q->unplug_timer.data = (unsigned long)q;
-
        blk_set_default_limits(&q->limits);
        blk_queue_max_hw_sectors(q, BLK_SAFE_MAX_SECTORS);