FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-16 22:10:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rbd: drop rbd_header_from_disk() gfp_flags parameter

Browse Source 
The function rbd_header_from_disk() is only called in one spot, and
it passes GFP_KERNEL as its value for the gfp_flags parameter.

Just drop that parameter and substitute GFP_KERNEL everywhere within
that function it had been used.  (If we find we need the parameter
again in the future it's easy enough to add back again.)

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder 2012-07-19 09:09:27 -05:00 committed by Sage Weil
parent 9a5d690b08
commit ed63f4fd9a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/block/rbd.c
View File

@ -493,8 +493,7 @@ static bool rbd_dev_ondisk_valid(struct rbd_image_header_ondisk *ondisk)
*/ */
static int rbd_header_from_disk(struct rbd_image_header *header, static int rbd_header_from_disk(struct rbd_image_header *header,
struct rbd_image_header_ondisk *ondisk, struct rbd_image_header_ondisk *ondisk,
u32 allocated_snaps, u32 allocated_snaps)
gfp_t gfp_flags)
{ {
u32 i, snap_count; u32 i, snap_count;
@ -507,18 +506,18 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
return -EINVAL; return -EINVAL;
header->snapc = kmalloc(sizeof(struct ceph_snap_context) + header->snapc = kmalloc(sizeof(struct ceph_snap_context) +
snap_count * sizeof(u64), snap_count * sizeof(u64),
gfp_flags); GFP_KERNEL);
if (!header->snapc) if (!header->snapc)
return -ENOMEM; return -ENOMEM;
header->snap_names_len = le64_to_cpu(ondisk->snap_names_len); header->snap_names_len = le64_to_cpu(ondisk->snap_names_len);
if (snap_count) { if (snap_count) {
header->snap_names = kmalloc(header->snap_names_len, header->snap_names = kmalloc(header->snap_names_len,
gfp_flags); GFP_KERNEL);
if (!header->snap_names) if (!header->snap_names)
goto err_snapc; goto err_snapc;
header->snap_sizes = kmalloc(snap_count * sizeof(u64), header->snap_sizes = kmalloc(snap_count * sizeof(u64),
gfp_flags); GFP_KERNEL);
if (!header->snap_sizes) if (!header->snap_sizes)
goto err_names; goto err_names;
} else { } else {
@ -527,7 +526,7 @@ static int rbd_header_from_disk(struct rbd_image_header *header,
} }
header->object_prefix = kmalloc(sizeof (ondisk->block_name) + 1, header->object_prefix = kmalloc(sizeof (ondisk->block_name) + 1,
gfp_flags); GFP_KERNEL);
if (!header->object_prefix) if (!header->object_prefix)
goto err_sizes; goto err_sizes;
@ -1625,7 +1624,7 @@ static int rbd_read_header(struct rbd_device *rbd_dev,
if (rc < 0) if (rc < 0)
goto out_dh; goto out_dh;
rc = rbd_header_from_disk(header, dh, snap_count, GFP_KERNEL); rc = rbd_header_from_disk(header, dh, snap_count);
if (rc < 0) { if (rc < 0) {
if (rc == -ENXIO) if (rc == -ENXIO)
pr_warning("unrecognized header format" pr_warning("unrecognized header format"