Skip to content

L
linux
Commit bae9e1dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge master.kernel.org:/home/davem/BK/sparc-2.5 

into home.transmeta.com:/home/torvalds/v2.5/linux
parents dee12d4f 766f012e
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
drivers/block/floppy.c
View file @ bae9e1dd
...@@ -2299,12 +2299,11 @@ static inline void end_request(struct request *req, int uptodate) ...@@ -2299,12 +2299,11 @@ static inline void end_request(struct request *req, int uptodate)
return; return;
add_blkdev_randomness(major(dev)); add_blkdev_randomness(major(dev));
floppy_off(DEVICE_NR(dev)); floppy_off(DEVICE_NR(dev));
blkdev_dequeue_request(req);
end_that_request_last(req); end_that_request_last(req);
/* Get the next request */ /* Get the next request */
req = elv_next_request(QUEUE); req = elv_next_request(QUEUE);
if (req)
blkdev_dequeue_request(req);
CURRENT = req; CURRENT = req;
} }
...@@ -2939,7 +2938,6 @@ static void redo_fd_request(void) ...@@ -2939,7 +2938,6 @@ static void redo_fd_request(void)
unlock_fdc(); unlock_fdc();
return; return;
} }
blkdev_dequeue_request(req);
CURRENT = req; CURRENT = req;
} }
if (major(CURRENT->rq_dev) != MAJOR_NR) if (major(CURRENT->rq_dev) != MAJOR_NR)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7