mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-03-18 13:04:18 +00:00
for-linus-20180605
-----BEGIN PGP SIGNATURE----- iQJEBAABCAAuFiEEwPw5LcreJtl1+l5K99NY+ylx4KYFAlsWpbkQHGF4Ym9lQGtl cm5lbC5kawAKCRD301j7KXHgpqQ6D/486OSA3eOdOErPS3ShHQ4kRVBveY7mcUIv ldLRbpZE7vu1VZ53M3dblXRgqh6LHaA0gwaHtC1k79F9FMzCaKwgq39AA5U4Q+WX foQRQQyCCGIh11ZRAmy1xqUJfmr9hHgqSGVy+lcGINXDUWYVm0Lu9q+JJeAZ30Zl amPrDsCdNa5J7fDcTqrYEz9lFmN2AXKXOrdRWGydDvqdX9cFqRIcuFnt0dKPwCgl sdfpMBIHTpksuJJYdl7AA5d5tyDHTQRhvgv4IR8nbwIQAI92nxzpYV/4QvgdNMNQ fnIIt7BpGA9uzBaTlqnjbkvFgE0dW7932V1fU7MSwkh2wkxy4yhFAhroY4+OQGm4 ShTv24TMfdCnK6O6fpTTvtaCxHO66ZD2415gBLRtIEZyo64xTlu+gqDrVCeiRisX UWCeFo4rQpeWGzksE94S6/Xp0u+x7yU+UNHzluzrx6dOosfwqSg0/BIrGUxEVvYC gbnPzEht9wx6aW+syd73gRHkwbZgd/hS+QE2ZtTN2EB7+sFKohVoEKugkq4vIIVY QujgUchXyNUjaRFWLuAEEcz3Fohu/xXSsaTd2j+qejUOTeZ0bLhz9Wj7Xm8iTkJs r9jshyinGZdTLjIqHWO9smPihkykLBEQmr+iWe8MIbwGchiyEqt/l4hJTxlKUNH4 aethuqJVLg== =c2I1 -----END PGP SIGNATURE----- Merge tag 'for-linus-20180605' of git://git.kernel.dk/linux-block Pull block fixes from Jens Axboe: "This just contains the dm kzalloc fix that was discussed, and a fix that I queued up yesterday for a case where blk-mq doesn't honor the stop bit appropriately" * tag 'for-linus-20180605' of git://git.kernel.dk/linux-block: dm: Use kzalloc for all structs with embedded biosets/mempools blk-mq: return when hctx is stopped in blk_mq_run_work_fn
This commit is contained in:
commit
11e7c21880
8 changed files with 8 additions and 8 deletions
|
@ -1475,7 +1475,7 @@ static void blk_mq_run_work_fn(struct work_struct *work)
|
|||
* If we are stopped, don't run the queue.
|
||||
*/
|
||||
if (test_bit(BLK_MQ_S_STOPPED, &hctx->state))
|
||||
clear_bit(BLK_MQ_S_STOPPED, &hctx->state);
|
||||
return;
|
||||
|
||||
__blk_mq_run_hw_queue(hctx);
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ static struct kmem_cache *_cell_cache;
|
|||
*/
|
||||
struct dm_bio_prison *dm_bio_prison_create(void)
|
||||
{
|
||||
struct dm_bio_prison *prison = kmalloc(sizeof(*prison), GFP_KERNEL);
|
||||
struct dm_bio_prison *prison = kzalloc(sizeof(*prison), GFP_KERNEL);
|
||||
int ret;
|
||||
|
||||
if (!prison)
|
||||
|
|
|
@ -35,7 +35,7 @@ static struct kmem_cache *_cell_cache;
|
|||
*/
|
||||
struct dm_bio_prison_v2 *dm_bio_prison_create_v2(struct workqueue_struct *wq)
|
||||
{
|
||||
struct dm_bio_prison_v2 *prison = kmalloc(sizeof(*prison), GFP_KERNEL);
|
||||
struct dm_bio_prison_v2 *prison = kzalloc(sizeof(*prison), GFP_KERNEL);
|
||||
int ret;
|
||||
|
||||
if (!prison)
|
||||
|
|
|
@ -51,7 +51,7 @@ struct dm_io_client *dm_io_client_create(void)
|
|||
unsigned min_ios = dm_get_reserved_bio_based_ios();
|
||||
int ret;
|
||||
|
||||
client = kmalloc(sizeof(*client), GFP_KERNEL);
|
||||
client = kzalloc(sizeof(*client), GFP_KERNEL);
|
||||
if (!client)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
|
|
|
@ -882,7 +882,7 @@ struct dm_kcopyd_client *dm_kcopyd_client_create(struct dm_kcopyd_throttle *thro
|
|||
int r;
|
||||
struct dm_kcopyd_client *kc;
|
||||
|
||||
kc = kmalloc(sizeof(*kc), GFP_KERNEL);
|
||||
kc = kzalloc(sizeof(*kc), GFP_KERNEL);
|
||||
if (!kc)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
|
|
|
@ -180,7 +180,7 @@ struct dm_region_hash *dm_region_hash_create(
|
|||
;
|
||||
nr_buckets >>= 1;
|
||||
|
||||
rh = kmalloc(sizeof(*rh), GFP_KERNEL);
|
||||
rh = kzalloc(sizeof(*rh), GFP_KERNEL);
|
||||
if (!rh) {
|
||||
DMERR("unable to allocate region hash memory");
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
|
|
@ -1120,7 +1120,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
|
|||
origin_mode = FMODE_WRITE;
|
||||
}
|
||||
|
||||
s = kmalloc(sizeof(*s), GFP_KERNEL);
|
||||
s = kzalloc(sizeof(*s), GFP_KERNEL);
|
||||
if (!s) {
|
||||
ti->error = "Cannot allocate private snapshot structure";
|
||||
r = -ENOMEM;
|
||||
|
|
|
@ -2861,7 +2861,7 @@ static struct pool *pool_create(struct mapped_device *pool_md,
|
|||
return (struct pool *)pmd;
|
||||
}
|
||||
|
||||
pool = kmalloc(sizeof(*pool), GFP_KERNEL);
|
||||
pool = kzalloc(sizeof(*pool), GFP_KERNEL);
|
||||
if (!pool) {
|
||||
*error = "Error allocating memory for pool";
|
||||
err_p = ERR_PTR(-ENOMEM);
|
||||
|
|
Loading…
Add table
Reference in a new issue