diff options
author | Linus Torvalds | 2011-11-05 01:22:14 +0100 |
---|---|---|
committer | Linus Torvalds | 2011-11-05 01:22:14 +0100 |
commit | 3d0a8d10cfb4cc3d1877c29a866ee7d8a46aa2fa (patch) | |
tree | 11a85044d1472f5972ae47ce10a2f446ad981e9f /include/linux/loop.h | |
parent | Merge branch 'for-3.2/core' of git://git.kernel.dk/linux-block (diff) | |
parent | virtio-blk: use ida to allocate disk index (diff) | |
download | kernel-qcow2-linux-3d0a8d10cfb4cc3d1877c29a866ee7d8a46aa2fa.tar.gz kernel-qcow2-linux-3d0a8d10cfb4cc3d1877c29a866ee7d8a46aa2fa.tar.xz kernel-qcow2-linux-3d0a8d10cfb4cc3d1877c29a866ee7d8a46aa2fa.zip |
Merge branch 'for-3.2/drivers' of git://git.kernel.dk/linux-block
* 'for-3.2/drivers' of git://git.kernel.dk/linux-block: (30 commits)
virtio-blk: use ida to allocate disk index
hpsa: add small delay when using PCI Power Management to reset for kump
cciss: add small delay when using PCI Power Management to reset for kump
xen/blkback: Fix two races in the handling of barrier requests.
xen/blkback: Check for proper operation.
xen/blkback: Fix the inhibition to map pages when discarding sector ranges.
xen/blkback: Report VBD_WSECT (wr_sect) properly.
xen/blkback: Support 'feature-barrier' aka old-style BARRIER requests.
xen-blkfront: plug device number leak in xlblk_init() error path
xen-blkfront: If no barrier or flush is supported, use invalid operation.
xen-blkback: use kzalloc() in favor of kmalloc()+memset()
xen-blkback: fixed indentation and comments
xen-blkfront: fix a deadlock while handling discard response
xen-blkfront: Handle discard requests.
xen-blkback: Implement discard requests ('feature-discard')
xen-blkfront: add BLKIF_OP_DISCARD and discard request struct
drivers/block/loop.c: remove unnecessary bdev argument from loop_clr_fd()
drivers/block/loop.c: emit uevent on auto release
drivers/block/cpqarray.c: use pci_dev->revision
loop: always allow userspace partitions and optionally support automatic scanning
...
Fic up trivial header file includsion conflict in drivers/block/loop.c
Diffstat (limited to 'include/linux/loop.h')
-rw-r--r-- | include/linux/loop.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/loop.h b/include/linux/loop.h index a06880689115..11a41a8f08eb 100644 --- a/include/linux/loop.h +++ b/include/linux/loop.h @@ -74,6 +74,7 @@ struct loop_device { enum { LO_FLAGS_READ_ONLY = 1, LO_FLAGS_AUTOCLEAR = 4, + LO_FLAGS_PARTSCAN = 8, }; #include <asm/posix_types.h> /* for __kernel_old_dev_t */ |