diff options
| author | Jens Axboe <axboe@fb.com> | 2015-05-20 18:05:57 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-05-20 18:05:57 +0300 |
| commit | b816d45fd56c57180b63a03412b9f898d5736c58 (patch) | |
| tree | f7af400415ff63c4ea28ae9c916715ac9484a490 /include/linux/blkdev.h | |
| parent | cddcd72bcec3b1dc9cef7f17d724a7fe42d64cc1 (diff) | |
| parent | b04a5636a665f5529fdf69ee7e5512156196f31c (diff) | |
| download | linux-b816d45fd56c57180b63a03412b9f898d5736c58.tar.xz | |
Merge branch 'for-4.2/core' into for-4.2/drivers
We need the blkdev_reread_part() changes for drivers to adapt.
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 2da818a48097..bc917956a6d0 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -444,7 +444,7 @@ struct request_queue { struct mutex sysfs_lock; int bypass_depth; - int mq_freeze_depth; + atomic_t mq_freeze_depth; #if defined(CONFIG_BLK_DEV_BSG) bsg_job_fn *bsg_job_fn; |