diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2015-06-24 17:24:33 +0300 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-08-04 16:52:34 +0200 |
| commit | fc5ae8b222da22bdb3c1c738c26ebc36a2ddc139 (patch) | |
| tree | 05f6de3b52ba6dabd3fe6413bdadf1bf6a4db974 | |
| parent | 85e77d46dc5ce2aa0bedd940cc755b8a237c4deb (diff) | |
| download | lwn-fc5ae8b222da22bdb3c1c738c26ebc36a2ddc139.tar.gz lwn-fc5ae8b222da22bdb3c1c738c26ebc36a2ddc139.zip | |
rbd: use GFP_NOIO in rbd_obj_request_create()
commit 5a60e87603c4c533492c515b7f62578189b03c9c upstream.
rbd_obj_request_create() is called on the main I/O path, so we need to
use GFP_NOIO to make sure allocation doesn't blow back on us. Not all
callers need this, but I'm still hardcoding the flag inside rather than
making it a parameter because a) this is going to stable, and b) those
callers shouldn't really use rbd_obj_request_create() and will be fixed
in the future.
More memory allocation fixes will follow.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/block/rbd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 78bfd5021827..6aeaa28f94f0 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1845,11 +1845,11 @@ static struct rbd_obj_request *rbd_obj_request_create(const char *object_name, rbd_assert(obj_request_type_valid(type)); size = strlen(object_name) + 1; - name = kmalloc(size, GFP_KERNEL); + name = kmalloc(size, GFP_NOIO); if (!name) return NULL; - obj_request = kmem_cache_zalloc(rbd_obj_request_cache, GFP_KERNEL); + obj_request = kmem_cache_zalloc(rbd_obj_request_cache, GFP_NOIO); if (!obj_request) { kfree(name); return NULL; |