mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-12 21:57:43 +00:00
Code Issues Releases Wiki Activity

ide-cd: use the new object_is_in_stack() helper

Browse source 
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Borislav Petkov <petkovbb@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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
FUJITA Tomonori 2008-10-10 22:39:22 +02:00 committed by Bartlomiej Zolnierkiewicz
parent 1a7809e349
commit efa402d59e
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/ide/ide-cd.c
View file

@ -1164,13 +1164,12 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
if (rq->bio || ((rq->cmd_type == REQ_TYPE_ATA_PC) && rq->data_len)) { if (rq->bio || ((rq->cmd_type == REQ_TYPE_ATA_PC) && rq->data_len)) {
struct request_queue *q = drive->queue; struct request_queue *q = drive->queue;
unsigned int alignment; unsigned int alignment;
unsigned long addr; char *buf;
unsigned long stack_mask = ~(THREAD_SIZE - 1);
if (rq->bio) if (rq->bio)
addr = (unsigned long)bio_data(rq->bio); buf = bio_data(rq->bio);
else else
addr = (unsigned long)rq->data; buf = rq->data;
info->dma = drive->using_dma; info->dma = drive->using_dma;
@ -1181,11 +1180,8 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
* separate masks. * separate masks.
*/ */
alignment = queue_dma_alignment(q) | q->dma_pad_mask; alignment = queue_dma_alignment(q) | q->dma_pad_mask;
if (addr & alignment || rq->data_len & alignment) if ((unsigned long)buf & alignment || rq->data_len & alignment
info->dma = 0; || object_is_on_stack(buf))
if (!((addr & stack_mask) ^
((unsigned long)current->stack & stack_mask)))
info->dma = 0; info->dma = 0;
} }
} }