diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-04-20 16:49:44 -0400 |
---|---|---|
committer | Alex Elder <elder@dreamhost.com> | 2012-05-14 13:12:35 -0400 |
commit | f8ad495a8a0277b88c59bf38319e5e944aaf5a4a (patch) | |
tree | af5cff21e0e0d9dd944abd1cf9f4da21d46e0f1c /drivers/block/rbd.c | |
parent | 76aa542fb90e3e91edb1146d10ca7cf2cae8e7e9 (diff) |
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/rbd.c')
-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, | |||
506 | header->snap_names_len = le64_to_cpu(ondisk->snap_names_len); | 506 | header->snap_names_len = le64_to_cpu(ondisk->snap_names_len); |
507 | if (snap_count) { | 507 | if (snap_count) { |
508 | header->snap_names = kmalloc(header->snap_names_len, | 508 | header->snap_names = kmalloc(header->snap_names_len, |
509 | GFP_KERNEL); | 509 | gfp_flags); |
510 | if (!header->snap_names) | 510 | if (!header->snap_names) |
511 | goto err_snapc; | 511 | goto err_snapc; |
512 | header->snap_sizes = kmalloc(snap_count * sizeof(u64), | 512 | header->snap_sizes = kmalloc(snap_count * sizeof(u64), |
513 | GFP_KERNEL); | 513 | gfp_flags); |
514 | if (!header->snap_sizes) | 514 | if (!header->snap_sizes) |
515 | goto err_names; | 515 | goto err_names; |
516 | } else { | 516 | } else { |