diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2015-06-24 17:24:33 +0300 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-07-05 10:12:55 -0400 |
| commit | 3e3deab3acaf752c4de0daf0ec4cd8c47c3bab0e (patch) | |
| tree | 8847e36743d9cc7b4914226494caf8ed34e1ea0d /drivers/block | |
| parent | 5ac8dc120f4a11415a6619648ebabd8d7037c26d (diff) | |
| download | lwn-3e3deab3acaf752c4de0daf0ec4cd8c47c3bab0e.tar.gz lwn-3e3deab3acaf752c4de0daf0ec4cd8c47c3bab0e.zip | |
rbd: use GFP_NOIO in rbd_obj_request_create()
[ Upstream commit 5a60e87603c4c533492c515b7f62578189b03c9c ]
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.
Cc: stable@vger.kernel.org # 3.10+
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/block')
| -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 5d684d97dc6d..501a8ca662f4 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1998,11 +1998,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; |