Merge tag 'nfs-for-6.1-1' of git://git.linux-nfs.org/projects/anna/linux-nfs

[platform/kernel/linux-rpi.git] / fs / nfs / nfs4proc.c

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 17362ba..e2efcd2 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -416,8 +416,8 @@ static int nfs4_delay_killable(long *timeout)
 {
        might_sleep();
 
-       freezable_schedule_timeout_killable_unsafe(
-               nfs4_update_delay(timeout));
+       __set_current_state(TASK_KILLABLE|TASK_FREEZABLE_UNSAFE);
+       schedule_timeout(nfs4_update_delay(timeout));
        if (!__fatal_signal_pending(current))
                return 0;
        return -EINTR;
@@ -427,7 +427,8 @@ static int nfs4_delay_interruptible(long *timeout)
 {
        might_sleep();
 
-       freezable_schedule_timeout_interruptible_unsafe(nfs4_update_delay(timeout));
+       __set_current_state(TASK_INTERRUPTIBLE|TASK_FREEZABLE_UNSAFE);
+       schedule_timeout(nfs4_update_delay(timeout));
        if (!signal_pending(current))
                return 0;
        return __fatal_signal_pending(current) ? -EINTR :-ERESTARTSYS;
@@ -7406,7 +7407,8 @@ nfs4_retry_setlk_simple(struct nfs4_state *state, int cmd,
                status = nfs4_proc_setlk(state, cmd, request);
                if ((status != -EAGAIN) || IS_SETLK(cmd))
                        break;
-               freezable_schedule_timeout_interruptible(timeout);
+               __set_current_state(TASK_INTERRUPTIBLE|TASK_FREEZABLE);
+               schedule_timeout(timeout);
                timeout *= 2;
                timeout = min_t(unsigned long, NFS4_LOCK_MAXTIMEOUT, timeout);
                status = -ERESTARTSYS;
@@ -7474,10 +7476,8 @@ nfs4_retry_setlk(struct nfs4_state *state, int cmd, struct file_lock *request)
                        break;
 
                status = -ERESTARTSYS;
-               freezer_do_not_count();
-               wait_woken(&waiter.wait, TASK_INTERRUPTIBLE,
+               wait_woken(&waiter.wait, TASK_INTERRUPTIBLE|TASK_FREEZABLE,
                           NFS4_LOCK_MAXTIMEOUT);
-               freezer_count();
        } while (!signalled());
 
        remove_wait_queue(q, &waiter.wait);