aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJens Axboe2014-02-12 10:34:01 -0600
committerJens Axboe2014-02-12 10:36:37 -0600
commitc8123f8c9cb517403b51aa41c3c46ff5e10b2c17 (patch)
tree434d3614e79458bc86e64a61034cbe9448177ea5 /block
parentabb97b8c502a270d59c0c2e1ecea78ad752372ee (diff)
downloadlinux-phy-c8123f8c9cb517403b51aa41c3c46ff5e10b2c17.tar.gz
linux-phy-c8123f8c9cb517403b51aa41c3c46ff5e10b2c17.tar.xz
linux-phy-c8123f8c9cb517403b51aa41c3c46ff5e10b2c17.zip
block: add cond_resched() to potentially long running ioctl discard loop
When mkfs issues a full device discard and the device only supports discards of a smallish size, we can loop in blkdev_issue_discard() for a long time. If preempt isn't enabled, this can turn into a softlock situation and the kernel will start complaining. Add an explicit cond_resched() at the end of the loop to avoid that. Cc: stable@kernel.org Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-lib.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/block/blk-lib.c b/block/blk-lib.c
index 2da76c999ef3..97a733cf3d5f 100644
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -119,6 +119,14 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
119 119
120 atomic_inc(&bb.done); 120 atomic_inc(&bb.done);
121 submit_bio(type, bio); 121 submit_bio(type, bio);
122
123 /*
124 * We can loop for a long time in here, if someone does
125 * full device discards (like mkfs). Be nice and allow
126 * us to schedule out to avoid softlocking if preempt
127 * is disabled.
128 */
129 cond_resched();
122 } 130 }
123 blk_finish_plug(&plug); 131 blk_finish_plug(&plug);
124 132