diff options
| author | Lukas Czerner <lczerner@redhat.com> | 2013-03-10 22:28:09 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2013-03-10 22:28:09 -0400 |
| commit | bb8b20ed94bc69120e31399c43cb336300dea109 (patch) | |
| tree | 29fcf8f8a55124ea700defdf951d23660306127f /fs | |
| parent | e3d85c366089015805f175324bb1780249f44669 (diff) | |
| download | linux-3.10-bb8b20ed94bc69120e31399c43cb336300dea109.tar.gz linux-3.10-bb8b20ed94bc69120e31399c43cb336300dea109.tar.bz2 linux-3.10-bb8b20ed94bc69120e31399c43cb336300dea109.zip | |
ext4: do not use yield()
Using yield() is strongly discouraged (see sched/core.c) especially
since we can just use cond_resched().
Replace all use of yield() with cond_resched().
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/inode.c | 2 | ||||
| -rw-r--r-- | fs/ext4/mballoc.c | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 117a9e7aa4a..48fc023ab0a 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -1352,7 +1352,7 @@ repeat: ei->i_da_metadata_calc_last_lblock = save_last_lblock; spin_unlock(&ei->i_block_reservation_lock); if (ext4_should_retry_alloc(inode->i_sb, &retries)) { - yield(); + cond_resched(); goto repeat; } dquot_release_reservation_block(inode, EXT4_C2B(sbi, 1)); diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 75e05f3a730..8b2ea9f7500 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -3692,11 +3692,7 @@ repeat: if (free < needed && busy) { busy = 0; ext4_unlock_group(sb, group); - /* - * Yield the CPU here so that we don't get soft lockup - * in non preempt case. - */ - yield(); + cond_resched(); goto repeat; } @@ -4246,7 +4242,7 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle, ext4_claim_free_clusters(sbi, ar->len, ar->flags)) { /* let others to free the space */ - yield(); + cond_resched(); ar->len = ar->len >> 1; } if (!ar->len) { |