author | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 17 Dec 2012 21:39:11 +0000 (13:39 -0800) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Mon, 17 Dec 2012 21:39:11 +0000 (13:39 -0800) |
Pull block driver update from Jens Axboe:
"Now that the core bits are in, here are the driver bits for 3.8. The
branch contains:
- A huge pile of drbd bits that were dumped from the 3.7 merge
window. Following that, it was both made perfectly clear that
there is going to be no more over-the-wall pulls and how the
situation on individual pulls can be improved.
- A few cleanups from Akinobu Mita for drbd and cciss.
- Queue improvement for loop from Lukas. This grew into adding a
generic interface for waiting/checking an even with a specific
lock, allowing this to be pulled out of md and now loop and drbd is
also using it.
- A few fixes for xen back/front block driver from Roger Pau Monne.
- Partition improvements from Stephen Warren, allowing partiion UUID
to be used as an identifier."
* 'for-3.8/drivers' of git://git.kernel.dk/linux-block: (609 commits)
drbd: update Kconfig to match current dependencies
drbd: Fix drbdsetup wait-connect, wait-sync etc... commands
drbd: close race between drbd_set_role and drbd_connect
drbd: respect no-md-barriers setting also when changed online via disk-options
drbd: Remove obsolete check
drbd: fixup after wait_even_lock_irq() addition to generic code
loop: Limit the number of requests in the bio list
wait: add wait_event_lock_irq() interface
xen-blkfront: free allocated page
xen-blkback: move free persistent grants code
block: partition: msdos: provide UUIDs for partitions
init: reduce PARTUUID min length to 1 from 36
block: store partition_meta_info.uuid as a string
cciss: use check_signature()
cciss: cleanup bitops usage
drbd: use copy_highpage
drbd: if the replication link breaks during handshake, keep retrying
drbd: check return of kmalloc in receive_uuids
drbd: Broadcast sync progress no more often than once per second
drbd: don't try to clear bits once the disk has failed
...
"Now that the core bits are in, here are the driver bits for 3.8. The
branch contains:
- A huge pile of drbd bits that were dumped from the 3.7 merge
window. Following that, it was both made perfectly clear that
there is going to be no more over-the-wall pulls and how the
situation on individual pulls can be improved.
- A few cleanups from Akinobu Mita for drbd and cciss.
- Queue improvement for loop from Lukas. This grew into adding a
generic interface for waiting/checking an even with a specific
lock, allowing this to be pulled out of md and now loop and drbd is
also using it.
- A few fixes for xen back/front block driver from Roger Pau Monne.
- Partition improvements from Stephen Warren, allowing partiion UUID
to be used as an identifier."
* 'for-3.8/drivers' of git://git.kernel.dk/linux-block: (609 commits)
drbd: update Kconfig to match current dependencies
drbd: Fix drbdsetup wait-connect, wait-sync etc... commands
drbd: close race between drbd_set_role and drbd_connect
drbd: respect no-md-barriers setting also when changed online via disk-options
drbd: Remove obsolete check
drbd: fixup after wait_even_lock_irq() addition to generic code
loop: Limit the number of requests in the bio list
wait: add wait_event_lock_irq() interface
xen-blkfront: free allocated page
xen-blkback: move free persistent grants code
block: partition: msdos: provide UUIDs for partitions
init: reduce PARTUUID min length to 1 from 36
block: store partition_meta_info.uuid as a string
cciss: use check_signature()
cciss: cleanup bitops usage
drbd: use copy_highpage
drbd: if the replication link breaks during handshake, keep retrying
drbd: check return of kmalloc in receive_uuids
drbd: Broadcast sync progress no more often than once per second
drbd: don't try to clear bits once the disk has failed
...
1 | 2 | |||
---|---|---|---|---|
block/genhd.c | patch | | diff1 | | diff2 | | blob | history |
drivers/block/cciss.c | patch | | diff1 | | diff2 | | blob | history |
drivers/block/loop.c | patch | | diff1 | | diff2 | | blob | history |
drivers/block/xen-blkback/common.h | patch | | diff1 | | diff2 | | blob | history |
drivers/block/xen-blkback/xenbus.c | patch | | diff1 | | diff2 | | blob | history |
drivers/md/md.c | patch | | diff1 | | diff2 | | blob | history |
drivers/md/raid1.c | patch | | diff1 | | diff2 | | blob | history |
drivers/md/raid10.c | patch | | diff1 | | diff2 | | blob | history |
drivers/md/raid5.c | patch | | diff1 | | diff2 | | blob | history |
include/linux/lru_cache.h | patch | | diff1 | | diff2 | | blob | history |
diff --cc block/genhd.c
Simple merge
diff --cc drivers/block/cciss.c
Simple merge
diff --cc drivers/block/loop.c
Simple merge
diff --cc drivers/block/xen-blkback/common.h
index 9a54623e52d74ecc77953937bd923a9ecdb68d09,ae7951f0e268e739a007243328589346ca12af5d..6072390c7f57ef724bee4476502eb78d63941c7c
struct block_device *bdev;
/* Cached size parameter. */
sector_t size;
- bool flush_support;
- bool discard_secure;
-
+ unsigned int flush_support:1;
+ unsigned int discard_secure:1;
+ unsigned int feature_gnt_persistent:1;
+ unsigned int overflow_max_grants:1;
};
struct backend_info;
diff --cc drivers/block/xen-blkback/xenbus.c
Simple merge
diff --cc drivers/md/md.c
Simple merge
diff --cc drivers/md/raid1.c
Simple merge
diff --cc drivers/md/raid10.c
Simple merge
diff --cc drivers/md/raid5.c
Simple merge
diff --cc include/linux/lru_cache.h
Simple merge