From: Olaf Faaland Date: Thu, 23 Feb 2017 17:52:08 +0000 (-0800) Subject: Linux 4.11 compat: set_task_state() removed X-Git-Tag: zfs-0.8.0-rc1~152^2~55 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d5feecacfdcca29336209bdccd6493a5fa53576;p=zfs Linux 4.11 compat: set_task_state() removed Replace uses of set_task_state(current, STATE) with set_current_state(STATE). In Linux 4.11, torvalds/linux@642fa44, set_task_state() is removed. All spl uses are of the form set_task_state(current, STATE). set_current_state(STATE) is equivalent and has been available since Linux 2.2.26. Furthermore, set_current_state(STATE) is already used in about 15 locations within spl. This change should have no impact other than removing an unnecessary dependency. Reviewed-by: Brian Behlendorf Signed-off-by: Olaf Faaland Closes #603 --- diff --git a/module/spl/spl-err.c b/module/spl/spl-err.c index 14ff8a337..cf9f096b1 100644 --- a/module/spl/spl-err.c +++ b/module/spl/spl-err.c @@ -65,7 +65,7 @@ spl_panic(const char *file, const char *func, int line, const char *fmt, ...) { spl_dumpstack(); /* Halt the thread to facilitate further debugging */ - set_task_state(current, TASK_UNINTERRUPTIBLE); + set_current_state(TASK_UNINTERRUPTIBLE); while (1) schedule(); @@ -98,7 +98,7 @@ vcmn_err(int ce, const char *fmt, va_list ap) spl_dumpstack(); /* Halt the thread to facilitate further debugging */ - set_task_state(current, TASK_UNINTERRUPTIBLE); + set_current_state(TASK_UNINTERRUPTIBLE); while (1) schedule(); }