[PATCH] drdb: don't check for failure from mempool_alloc()

[NeilBrown]

mempool_alloc() cannot fail if the gfp flags allow
it to sleep, and GFP_NOIO allows for sleeping.
So drbd_req_new() cannot fail, and drbd_request_prepare() doesn't need
to check if it did.

Signed-off-by: NeilBrown <ne...@suse.com>
---
 drivers/block/drbd/drbd_req.c | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 652114ae1a8a..2e796f79b324 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -52,8 +52,6 @@ static struct drbd_request *drbd_req_new(struct drbd_device 
*device, struct bio
        struct drbd_request *req;
 
        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);
@@ -1214,15 +1212,6 @@ drbd_request_prepare(struct drbd_device *device, struct 
bio *bio, unsigned long
 
        /* allocate outside of all locks; */
        req = drbd_req_new(device, bio);
-       if (!req) {
-               dec_ap_bio(device);
-               /* only pass the error to the upper layers.
-                * if user cannot handle io errors, that's not our business. */
-               drbd_err(device, "could not kmalloc() req\n");
-               bio->bi_error = -ENOMEM;
-               bio_endio(bio);
-               return ERR_PTR(-ENOMEM);
-       }
        req->start_jif = start_jif;
 
        if (!get_ldev(device)) {
-- 
2.12.2

signature.asc
Description: PGP signature