diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-03-20 08:09:19 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-03-20 08:13:50 +0200 |
| commit | 17d5ca91cfc59ae91da5ff9da74ab09a9a2a17d9 (patch) | |
| tree | a45f944e15a2600ec20ca4ec11b23d4641095e8e /block/blk-lib.c | |
| parent | b7e4ab50418d5b34ab0dae95193dd71190e1fb50 (diff) | |
| parent | c86907b59f505863ec7839471e889330982a596e (diff) | |
| download | linux-17d5ca91cfc59ae91da5ff9da74ab09a9a2a17d9.tar.gz linux-17d5ca91cfc59ae91da5ff9da74ab09a9a2a17d9.tar.bz2 linux-17d5ca91cfc59ae91da5ff9da74ab09a9a2a17d9.zip | |
Merge branch '3.15/dss-dt' into 3.15/fbdev
Merge OMAP DSS DT support
Diffstat (limited to 'block/blk-lib.c')
| -rw-r--r-- | block/blk-lib.c | 8 |
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, atomic_inc(&bb.done); 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(); } blk_finish_plug(&plug); |