Merge tag 'libnvdimm-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdim...

[linux-2.6-microblaze.git] / fs / jbd2 / journal.c

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index fa8cde4..67546c7 100644 (file)
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -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();