hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jbd2: convert timers to use timer_setup() 

In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jan Kara <jack@suse.com>
Cc: linux-ext4@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Kees Cook 2017-10-18 12:40:28 -04:00 committed by Theodore Ts'o
parent 8058cac6a1
commit e3c957885e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/jbd2/journal.c
View File

@ -165,11 +165,11 @@ static void jbd2_superblock_csum_set(journal_t *j, journal_superblock_t *sb)
* Helper function used to manage commit timeouts * Helper function used to manage commit timeouts
*/ */
static void commit_timeout(unsigned long __data) static void commit_timeout(struct timer_list *t)
{ {
struct task_struct * p = (struct task_struct *) __data; journal_t *journal = from_timer(journal, t, j_commit_timer);
wake_up_process(p); wake_up_process(journal->j_task);
} }
/* /*
@ -197,8 +197,7 @@ static int kjournald2(void *arg)
* Set up an interval timer which can be used to trigger a commit wakeup * Set up an interval timer which can be used to trigger a commit wakeup
* after the commit interval expires * after the commit interval expires
*/ */
setup_timer(&journal->j_commit_timer, commit_timeout, timer_setup(&journal->j_commit_timer, commit_timeout, 0);
(unsigned long)current);
set_freezable(); set_freezable();