diff options
| author | David Rientjes <rientjes@google.com> | 2015-03-25 00:22:32 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-03-25 03:00:16 +0100 |
| commit | 23fe8f8b1101ec77befc995ab15fad82d9d91d16 (patch) | |
| tree | dd198fb89b2f677bd8bc3d085579827fded8237b /drivers/block | |
| parent | brd: update maintainer to be Jens Axboe (diff) | |
| download | linux-23fe8f8b1101ec77befc995ab15fad82d9d91d16.tar.xz linux-23fe8f8b1101ec77befc995ab15fad82d9d91d16.zip | |
block, drbd: fix drbd_req_new() initialization
mempool_alloc() does not support __GFP_ZERO since elements may come from
memory that has already been released by mempool_free().
Remove __GFP_ZERO from mempool_alloc() in drbd_req_new() and properly
initialize it to 0.
Cc: Lars Ellenberg <drbd-dev@lists.linbit.com>
Cc: Jens Axboe <axboe@fb.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_req.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index 34f2f0ba409b..3907202fb9d9 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -52,9 +52,10 @@ static struct drbd_request *drbd_req_new(struct drbd_device *device, { struct drbd_request *req; - req = mempool_alloc(drbd_request_mempool, GFP_NOIO | __GFP_ZERO); + req = mempool_alloc(drbd_request_mempool, GFP_NOIO); if (!req) return NULL; + memset(req, 0, sizeof(*req)); drbd_req_make_private_bio(req, bio_src); req->rq_state = bio_data_dir(bio_src) == WRITE ? RQ_WRITE : 0; |