diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2018-01-23 14:46:53 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-03-26 15:09:36 +0200 |
| commit | bc5511d0eda1c2534aa3cedb485eae1fc354f2dc (patch) | |
| tree | 59ae4fb7db92adf90024cd10a231e4d7b9d46de4 | |
| parent | f9cacae3145a07c8a2b699f18824df0cf7778431 (diff) | |
| download | linux-stable-bc5511d0eda1c2534aa3cedb485eae1fc354f2dc.tar.gz linux-stable-bc5511d0eda1c2534aa3cedb485eae1fc354f2dc.tar.bz2 linux-stable-bc5511d0eda1c2534aa3cedb485eae1fc354f2dc.zip | |
btrfs: Use schedule_timeout_interruptible
Instead of manually fiddling with the state of the task
(RUNNING->INTERRUPTIBLE->RUNNING) again just use schedule_timeout_interruptible
which adjusts the task state as needed. No functional changes.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Josef Bacik <jbacik@fb.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/disk-io.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index b23961a4af52..fa80de56340f 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1800,12 +1800,10 @@ sleep: if (unlikely(test_bit(BTRFS_FS_STATE_ERROR, &fs_info->fs_state))) btrfs_cleanup_transaction(fs_info); - set_current_state(TASK_INTERRUPTIBLE); if (!kthread_should_stop() && (!btrfs_transaction_blocked(fs_info) || cannot_commit)) - schedule_timeout(delay); - __set_current_state(TASK_RUNNING); + schedule_timeout_interruptible(delay); } while (!kthread_should_stop()); return 0; } |