| Message ID | 1516711613-18533-1-git-send-email-nborisov@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jan 23, 2018 at 02:46:53PM +0200, Nikolay Borisov wrote: > 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> Thanks, Josef -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Jan 24, 2018 at 10:38:51AM -0500, Josef Bacik wrote: > On Tue, Jan 23, 2018 at 02:46:53PM +0200, Nikolay Borisov wrote: > > 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> Added to next, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index ed095202942f..f32d81ca1046 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1807,12 +1807,10 @@ static int transaction_kthread(void *arg) 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; }
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> --- fs/btrfs/disk-io.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)