diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index b4e8b339d2..c47aaf5def 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -1055,7 +1055,7 @@ ssize_t Process::sys$read(int fd, void* outbuf, size_t nread) return -EBADF; if (descriptor->is_blocking()) { if (!descriptor->has_data_available_for_reading()) { - m_fdBlockedOnRead = fd; + m_blocked_fd = fd; block(BlockedRead); sched_yield(); if (m_was_interrupted_while_blocked) diff --git a/Kernel/Process.h b/Kernel/Process.h index f036397f2b..56c829d7dd 100644 --- a/Kernel/Process.h +++ b/Kernel/Process.h @@ -266,7 +266,6 @@ private: void* m_kernelStack { nullptr }; dword m_timesScheduled { 0 }; pid_t m_waitee_pid { -1 }; - int m_fdBlockedOnRead { -1 }; int m_blocked_fd { -1 }; size_t m_max_open_file_descriptors { 16 }; SignalActionData m_signal_action_data[32]; diff --git a/Kernel/Scheduler.cpp b/Kernel/Scheduler.cpp index 58093f5707..56fe2ddf7f 100644 --- a/Kernel/Scheduler.cpp +++ b/Kernel/Scheduler.cpp @@ -49,9 +49,9 @@ bool Scheduler::pick_next() } if (process.state() == Process::BlockedRead) { - ASSERT(process.m_fdBlockedOnRead != -1); + ASSERT(process.m_blocked_fd != -1); // FIXME: Block until the amount of data wanted is available. - if (process.m_fds[process.m_fdBlockedOnRead].descriptor->has_data_available_for_reading()) + if (process.m_fds[process.m_blocked_fd].descriptor->has_data_available_for_reading()) process.unblock(); return true; }