Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a76eef95 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Linus Torvalds
Browse files

block/blk-map.c: use the new object_is_on_stack() helper 



Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Tejun Heo <htejun@gmail.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a2e2e357

block/blk-map.c

+2 −6
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf, 
	int reading = rq_data_dir(rq) == READ;

	int do_copy = 0;

	struct bio *bio;

	unsigned long stack_mask = ~(THREAD_SIZE - 1);



	if (len > (q->max_hw_sectors << 9))

		return -EINVAL;
@@ -278,11 +277,8 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf, 


	kaddr = (unsigned long)kbuf;

	alignment = queue_dma_alignment(q) | q->dma_pad_mask;

	do_copy = ((kaddr & alignment) || (len & alignment));



	if (!((kaddr & stack_mask) ^

	      ((unsigned long)current->stack & stack_mask)))

		do_copy = 1;

	do_copy = ((kaddr & alignment) || (len & alignment) ||

		   object_is_on_stack(kbuf));



	if (do_copy)

		bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);