diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-31 12:10:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-31 12:10:26 -0700 |
commit | a5bc92cdf2ab27a15732976004b3755c40740f57 (patch) | |
tree | ab7ee562f31ed9fddac78c1e17a2ba9eee6cb028 /block/blk-settings.c | |
parent | 6eb80e00bff341dd09a7ec8b9dba6da8410448bf (diff) | |
parent | cbb4f2646d77b536ed2b1500ef6641083228ed8f (diff) |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
io context: fix ref counting
block: make the end_io functions be non-GPL exports
block: fix improper kobject release in blk_integrity_unregister
block: always assign default lock to queues
mg_disk: Add missing ready status check on mg_write()
mg_disk: fix issue with data integrity on error in mg_write()
mg_disk: fix reading invalid status when use polling driver
mg_disk: remove prohibited sleep operation
Diffstat (limited to 'block/blk-settings.c')
-rw-r--r-- | block/blk-settings.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c index bd582a7f531..8a3ea3bba10 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -165,6 +165,13 @@ void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn) blk_set_default_limits(&q->limits); /* + * If the caller didn't supply a lock, fall back to our embedded + * per-queue locks + */ + if (!q->queue_lock) + q->queue_lock = &q->__queue_lock; + + /* * by default assume old behaviour and bounce for any highmem page */ blk_queue_bounce_limit(q, BLK_BOUNCE_HIGH); |