block: add gfp_mask argument to blk_rq_map_user and blk_rq_map_user_iov

Currently, blk_rq_map_user and blk_rq_map_user_iov always do
GFP_KERNEL allocation.

This adds gfp_mask argument to blk_rq_map_user and blk_rq_map_user_iov
so sg can use it (sg always does GFP_ATOMIC allocation).

Signed-off-by: FUJITA Tomonori <[email protected]>
Signed-off-by: Douglas Gilbert <[email protected]>
Cc: Mike Christie <[email protected]>
Cc: James Bottomley <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
FUJITA Tomonori 2008-08-28 16:17:05 +09:00 • committed by Jens Axboe
commit a3bce90edd
8 changed files with 47 additions and 34 deletions

View file

@ -2097,7 +2097,7 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
len = nr * CD_FRAMESIZE_RAW;
ret = blk_rq_map_user(q, rq, ubuf, len);
ret = blk_rq_map_user(q, rq, ubuf, len, GFP_KERNEL);
if (ret)
break;