diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2020-09-29 22:27:21 +0200 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2020-09-29 22:31:35 +0200 |
| commit | 1471308fb5ec4335f9ae9fc65f65048dbe7c336e (patch) | |
| tree | 69aef90f47105e1c730e5277f352d3d5446a1174 /block/bsg-lib.c | |
| parent | dm crypt: document encrypted keyring key option (diff) | |
| parent | block-mq: fix comments in blk_mq_queue_tag_busy_iter (diff) | |
| download | linux-1471308fb5ec4335f9ae9fc65f65048dbe7c336e.tar.xz linux-1471308fb5ec4335f9ae9fc65f65048dbe7c336e.zip | |
Merge remote-tracking branch 'jens/for-5.10/block' into dm-5.10
DM depends on these block 5.10 commits:
22ada802ede8 block: use lcm_not_zero() when stacking chunk_sectors
07d098e6bbad block: allow 'chunk_sectors' to be non-power-of-2
021a24460dc2 block: add QUEUE_FLAG_NOWAIT
6abc49468eea dm: add support for REQ_NOWAIT and enable it for linear target
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'block/bsg-lib.c')
| -rw-r--r-- | block/bsg-lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/bsg-lib.c b/block/bsg-lib.c index d185396d88bb..330fede77271 100644 --- a/block/bsg-lib.c +++ b/block/bsg-lib.c @@ -207,7 +207,7 @@ static int bsg_map_buffer(struct bsg_buffer *buf, struct request *req) BUG_ON(!req->nr_phys_segments); - buf->sg_list = kzalloc(sz, GFP_KERNEL); + buf->sg_list = kmalloc(sz, GFP_KERNEL); if (!buf->sg_list) return -ENOMEM; sg_init_table(buf->sg_list, req->nr_phys_segments); |