mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-12 21:44:06 +08:00
floppy: use warning macros
Convert assertions to use WARN(). There are several error checks in the code for things that should never happen. Convert them to standard warnings so kerneloops.org will see them. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
This commit is contained in:
parent
b862f26fe1
commit
01b6b67eda
@ -2542,10 +2542,8 @@ static int make_raw_rw_request(void)
|
||||
int tracksize;
|
||||
int ssize;
|
||||
|
||||
if (max_buffer_sectors == 0) {
|
||||
pr_info("VFS: Block I/O scheduled on unopened device\n");
|
||||
if (WARN(max_buffer_sectors == 0, "VFS: Block I/O scheduled on unopened device\n"))
|
||||
return 0;
|
||||
}
|
||||
|
||||
set_fdc((long)current_req->rq_disk->private_data);
|
||||
|
||||
@ -2895,19 +2893,16 @@ static void process_fd_request(void)
|
||||
|
||||
static void do_fd_request(struct request_queue *q)
|
||||
{
|
||||
if (max_buffer_sectors == 0) {
|
||||
pr_info("VFS: %s called on non-open device\n", __func__);
|
||||
if (WARN(max_buffer_sectors == 0,
|
||||
"VFS: %s called on non-open device\n", __func__))
|
||||
return;
|
||||
}
|
||||
|
||||
if (atomic_read(&usage_count) == 0) {
|
||||
pr_info("warning: usage count=0, current_req=%p exiting\n",
|
||||
current_req);
|
||||
pr_info("sect=%ld type=%x flags=%x\n",
|
||||
(long)blk_rq_pos(current_req), current_req->cmd_type,
|
||||
current_req->cmd_flags);
|
||||
if (WARN(atomic_read(&usage_count) == 0,
|
||||
"warning: usage count=0, current_req=%p sect=%ld type=%x flags=%x\n",
|
||||
current_req, (long)blk_rq_pos(current_req), current_req->cmd_type,
|
||||
current_req->cmd_flags))
|
||||
return;
|
||||
}
|
||||
|
||||
if (test_bit(0, &fdc_busy)) {
|
||||
/* fdc busy, this new request will be treated when the
|
||||
current one is done */
|
||||
@ -3817,10 +3812,10 @@ static int floppy_revalidate(struct gendisk *disk)
|
||||
if (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags) ||
|
||||
test_bit(FD_VERIFY_BIT, &UDRS->flags) ||
|
||||
test_bit(drive, &fake_change) || NO_GEOM) {
|
||||
if (atomic_read(&usage_count) == 0) {
|
||||
pr_info("VFS: revalidate called on non-open device.\n");
|
||||
if (WARN(atomic_read(&usage_count) == 0,
|
||||
"VFS: revalidate called on non-open device.\n"))
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
lock_fdc(drive, false);
|
||||
cf = (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags) ||
|
||||
test_bit(FD_VERIFY_BIT, &UDRS->flags));
|
||||
|
Loading…
Reference in New Issue
Block a user