git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bluetooth: Properly check L2CAP config option output buffer length
[pandora-kernel.git]
/
block
/
blk-core.c
diff --git
a/block/blk-core.c
b/block/blk-core.c
index
50c8305
..
ec494ff
100644
(file)
--- a/
block/blk-core.c
+++ b/
block/blk-core.c
@@
-483,6
+483,7
@@
struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
}
if (blk_throtl_init(q)) {
}
if (blk_throtl_init(q)) {
+ bdi_destroy(&q->backing_dev_info);
kmem_cache_free(blk_requestq_cachep, q);
return NULL;
}
kmem_cache_free(blk_requestq_cachep, q);
return NULL;
}
@@
-2076,7
+2077,7
@@
bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)
if (!req->bio)
return false;
if (!req->bio)
return false;
- trace_block_rq_complete(req->q, req);
+ trace_block_rq_complete(req->q, req
, nr_bytes
);
/*
* For fs requests, rq is just carrier of independent bio's
/*
* For fs requests, rq is just carrier of independent bio's