diff options
| author |   Jens Axboe <axboe@fb.com> | 2014-05-28 12:37:04 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-05-28 12:37:04 -0600 |
| commit | 879466e6a53ce063fa779476cf648abafcd703a9 (patch) | |
| tree | dc0827609f020f237cd201b8e0345bdef2b17190 /include | |
| parent | Merge branch 'for-3.16/core' into for-3.16/drivers (diff) | |
| parent | xen-blkback: defer freeing blkif to avoid blocking xenwatch (diff) | |
| download | linux-dev-879466e6a53ce063fa779476cf648abafcd703a9.tar.xz linux-dev-879466e6a53ce063fa779476cf648abafcd703a9.zip | |
Merge branch 'stable/for-jens-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip into for-3.16/drivers
Konrad writes:
Please git pull the following branch:
git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git stable/for-jens-3.16
which has a bunch of fixes to the Xen block frontend and backend driver
and a new parameter for Xen backend driver - an override (set by the toolstack)
whether to expose the discard support (if disk of course supports it) or not.
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/interface/io/blkif.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xen/interface/io/blkif.h b/include/xen/interface/io/blkif.h index 32ec05a6572f..c33e1c489eb2 100644 --- a/include/xen/interface/io/blkif.h +++ b/include/xen/interface/io/blkif.h @@ -86,7 +86,7 @@ typedef uint64_t blkif_sector_t; * Interface%20manuals/100293068c.pdf * The backend can optionally provide three extra XenBus attributes to * further optimize the discard functionality: - * 'discard-aligment' - Devices that support discard functionality may + * 'discard-alignment' - Devices that support discard functionality may * internally allocate space in units that are bigger than the exported * logical block size. The discard-alignment parameter indicates how many bytes * the beginning of the partition is offset from the internal allocation unit's |