UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

floppy: cleanup: get rid of current_reqD in favor of current_drive 

This macro equals -1 and is used as an alternative for current_drive when
calling reschedule_timeout(), which in turn needs to remap it. This only
adds obfuscation, let's simply use current_drive.

Link: https://lore.kernel.org/r/20200410101904.14652-2-w@1wt.eu
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Denis Efremov <efremov@linux.com>
This commit is contained in:
Willy Tarreau 2020-04-10 12:19:03 +02:00 committed by Denis Efremov
parent 6111a4f9bb
commit 99ba6ccc7f
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/block/floppy.c
View File

@ -668,16 +668,12 @@ static struct output_log {
static int output_log_pos; static int output_log_pos;
#define current_reqD -1
#define MAXTIMEOUT -2 #define MAXTIMEOUT -2
static void __reschedule_timeout(int drive, const char *message) static void __reschedule_timeout(int drive, const char *message)
{ {
unsigned long delay; unsigned long delay;
if (drive == current_reqD)
drive = current_drive;
if (drive < 0 || drive >= N_DRIVE) { if (drive < 0 || drive >= N_DRIVE) {
delay = 20UL * HZ; delay = 20UL * HZ;
drive = 0; drive = 0;
@ -1960,7 +1956,7 @@ static void floppy_ready(void)
static void floppy_start(void) static void floppy_start(void)
{ {
reschedule_timeout(current_reqD, "floppy start"); reschedule_timeout(current_drive, "floppy start");
scandrives(); scandrives();
debug_dcl(drive_params[current_drive].flags, debug_dcl(drive_params[current_drive].flags,
@ -2874,7 +2870,7 @@ do_request:
} }
drive = (long)current_req->rq_disk->private_data; drive = (long)current_req->rq_disk->private_data;
set_fdc(drive); set_fdc(drive);
reschedule_timeout(current_reqD, "redo fd request"); reschedule_timeout(current_drive, "redo fd request");
set_floppy(drive); set_floppy(drive);
raw_cmd = &default_raw_cmd; raw_cmd = &default_raw_cmd;