path: root/block
diff options
authorJens Axboe <axboe@fb.com>2014-02-12 09:34:01 -0700
committerJens Axboe <axboe@fb.com>2014-02-12 09:36:37 -0700
commitc8123f8c9cb517403b51aa41c3c46ff5e10b2c17 (patch)
tree434d3614e79458bc86e64a61034cbe9448177ea5 /block
parentabb97b8c502a270d59c0c2e1ecea78ad752372ee (diff)
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')
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,
submit_bio(type, bio);
+ /*
+ * We can loop for a long time in here, if someone does
+ * full device discards (like mkfs). Be nice and allow
+ * us to schedule out to avoid softlocking if preempt
+ * is disabled.
+ */
+ cond_resched();