diff options
| author | Dan Carpenter | 2012-04-20 22:49:44 +0200 |
|---|---|---|
| committer | Alex Elder | 2012-05-14 19:12:35 +0200 |
| commit | f8ad495a8a0277b88c59bf38319e5e944aaf5a4a (patch) | |
| tree | af5cff21e0e0d9dd944abd1cf9f4da21d46e0f1c /drivers/block | |
| parent | ceph: fix bounds check in ceph_decode_need and ceph_encode_need (diff) | |
| download | kernel-qcow2-linux-f8ad495a8a0277b88c59bf38319e5e944aaf5a4a.tar.gz kernel-qcow2-linux-f8ad495a8a0277b88c59bf38319e5e944aaf5a4a.tar.xz kernel-qcow2-linux-f8ad495a8a0277b88c59bf38319e5e944aaf5a4a.zip | |
rbd: use gfp_flags parameter in rbd_header_from_disk()
We should use the gfp_flags that the caller specified instead of
GFP_KERNEL here.
There is only one caller and it uses GFP_KERNEL, so this change is
just a cleanup and doesn't change how the code works.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Alex Elder <elder@dreamhost.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 a67fa63a966b..ca59d4d9471e 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -506,11 +506,11 @@ static int rbd_header_from_disk(struct rbd_image_header *header, header->snap_names_len = le64_to_cpu(ondisk->snap_names_len); if (snap_count) { header->snap_names = kmalloc(header->snap_names_len, - GFP_KERNEL); + gfp_flags); if (!header->snap_names) goto err_snapc; header->snap_sizes = kmalloc(snap_count * sizeof(u64), - GFP_KERNEL); + gfp_flags); if (!header->snap_sizes) goto err_names; } else { |