diff options
| author | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2015-07-03 10:40:43 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-07-04 15:56:57 -0400 |
| commit | 43c3dd08da890e458f670b4fc0630513fb405620 (patch) | |
| tree | dec5680cef5115900d2292dd100361a5446db532 /fs/block_dev.c | |
| parent | bbab37ddc20bae4709bca8745c128c4f46fe63c5 (diff) | |
| download | linux-43c3dd08da890e458f670b4fc0630513fb405620.tar.gz linux-43c3dd08da890e458f670b4fc0630513fb405620.tar.bz2 linux-43c3dd08da890e458f670b4fc0630513fb405620.zip | |
dax: bdev_direct_access() may sleep
The brd driver is the only in-tree driver that may sleep currently.
After some discussion on linux-fsdevel, we decided that any driver
may choose to sleep in its ->direct_access method. To ensure that all
callers of bdev_direct_access() are prepared for this, add a call
to might_sleep().
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/block_dev.c')
| -rw-r--r-- | fs/block_dev.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 5dde6dff4940..12b22ddb22ef 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -445,6 +445,12 @@ long bdev_direct_access(struct block_device *bdev, sector_t sector, long avail; const struct block_device_operations *ops = bdev->bd_disk->fops; + /* + * The device driver is allowed to sleep, in order to make the + * memory directly accessible. + */ + might_sleep(); + if (size < 0) return size; if (!ops->direct_access) |