A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-29 19:21:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

jbd2: convert timers to use timer_setup()

Browse source 
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 <[email protected]>
Signed-off-by: Theodore Ts'o <[email protected]>
Reviewed-by: Jan Kara <[email protected]>
Cc: [email protected]
Cc: Thomas Gleixner <[email protected]>
This commit is contained in:
Kees Cook 2017-10-18 12:40:28 -04:00 • committed by Theodore Ts'o
commit e3c957885e
1 changed files with 4 additions and 5 deletions
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
*/
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
* after the commit interval expires
*/
setup_timer(&journal->j_commit_timer, commit_timeout,
(unsigned long)current);
timer_setup(&journal->j_commit_timer, commit_timeout, 0);
set_freezable();