diff options
| author | Dave Chinner <david@fromorbit.com> | 2016-03-07 09:30:12 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2016-03-07 09:30:12 +1100 |
| commit | 6d247d47fbd6883f7096e0e672afbdba6286dbc4 (patch) | |
| tree | ef576302d9f0075bf77725132dd886f00443beec /fs/xfs/xfs_trans_ail.c | |
| parent | acb3e26fc3652d43cb5cf07c311ed55f3aecf40e (diff) | |
| parent | af055e37a91d215d7174d0b84c86795ca81086a7 (diff) | |
Merge branch 'xfs-misc-fixes-4.6' into for-next
Diffstat (limited to 'fs/xfs/xfs_trans_ail.c')
| -rw-r--r-- | fs/xfs/xfs_trans_ail.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c index 4f18fd92ca13..d6c9c3e9e02b 100644 --- a/fs/xfs/xfs_trans_ail.c +++ b/fs/xfs/xfs_trans_ail.c @@ -497,6 +497,7 @@ xfsaild( long tout = 0; /* milliseconds */ current->flags |= PF_MEMALLOC; + set_freezable(); while (!kthread_should_stop()) { if (tout && tout <= 20) @@ -519,14 +520,14 @@ xfsaild( if (!xfs_ail_min(ailp) && ailp->xa_target == ailp->xa_target_prev) { spin_unlock(&ailp->xa_lock); - schedule(); + freezable_schedule(); tout = 0; continue; } spin_unlock(&ailp->xa_lock); if (tout) - schedule_timeout(msecs_to_jiffies(tout)); + freezable_schedule_timeout(msecs_to_jiffies(tout)); __set_current_state(TASK_RUNNING); |