https://github.com/torvalds/linux
Revision a7e546f175f07630453c44b5afe14dd667dcfec9 authored by Linus Torvalds on 25 August 2012, 18:36:43 UTC, committed by Linus Torvalds on 25 August 2012, 18:36:43 UTC
Pull block-related fixes from Jens Axboe: - Improvements to the buffered and direct write IO plugging from Fengguang. - Abstract out the mapping of a bio in a request, and use that to provide a blk_bio_map_sg() helper. Useful for mapping just a bio instead of a full request. - Regression fix from Hugh, fixing up a patch that went into the previous release cycle (and marked stable, too) attempting to prevent a loop in __getblk_slow(). - Updates to discard requests, fixing up the sizing and how we align them. Also a change to disallow merging of discard requests, since that doesn't really work properly yet. - A few drbd fixes. - Documentation updates. * 'for-linus' of git://git.kernel.dk/linux-block: block: replace __getblk_slow misfix by grow_dev_page fix drbd: Write all pages of the bitmap after an online resize drbd: Finish requests that completed while IO was frozen drbd: fix drbd wire compatibility for empty flushes Documentation: update tunable options in block/cfq-iosched.txt Documentation: update tunable options in block/cfq-iosched.txt Documentation: update missing index files in block/00-INDEX block: move down direct IO plugging block: remove plugging at buffered write time block: disable discard request merge temporarily bio: Fix potential memory leak in bio_find_or_create_slab() block: Don't use static to define "void *p" in show_partition_start() block: Add blk_bio_map_sg() helper block: Introduce __blk_segment_map_sg() helper fs/block-dev.c:fix performance regression in O_DIRECT writes to md block devices block: split discard into aligned requests block: reorganize rounding of max_discard_sectors
Tip revision: a7e546f175f07630453c44b5afe14dd667dcfec9 authored by Linus Torvalds on 25 August 2012, 18:36:43 UTC
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Tip revision: a7e546f
File | Mode | Size |
---|---|---|
partitions | ||
Kconfig | -rw-r--r-- | 3.3 KB |
Kconfig.iosched | -rw-r--r-- | 1.6 KB |
Makefile | -rw-r--r-- | 720 bytes |
blk-cgroup.c | -rw-r--r-- | 23.7 KB |
blk-cgroup.h | -rw-r--r-- | 13.6 KB |
blk-core.c | -rw-r--r-- | 81.1 KB |
blk-exec.c | -rw-r--r-- | 3.1 KB |
blk-flush.c | -rw-r--r-- | 13.1 KB |
blk-integrity.c | -rw-r--r-- | 11.5 KB |
blk-ioc.c | -rw-r--r-- | 10.2 KB |
blk-iopoll.c | -rw-r--r-- | 5.9 KB |
blk-lib.c | -rw-r--r-- | 4.5 KB |
blk-map.c | -rw-r--r-- | 8.2 KB |
blk-merge.c | -rw-r--r-- | 13.2 KB |
blk-settings.c | -rw-r--r-- | 25.7 KB |
blk-softirq.c | -rw-r--r-- | 4.5 KB |
blk-sysfs.c | -rw-r--r-- | 14.8 KB |
blk-tag.c | -rw-r--r-- | 9.8 KB |
blk-throttle.c | -rw-r--r-- | 31.0 KB |
blk-timeout.c | -rw-r--r-- | 4.7 KB |
blk.h | -rw-r--r-- | 7.1 KB |
bsg-lib.c | -rw-r--r-- | 6.2 KB |
bsg.c | -rw-r--r-- | 23.7 KB |
cfq-iosched.c | -rw-r--r-- | 108.1 KB |
compat_ioctl.c | -rw-r--r-- | 20.8 KB |
deadline-iosched.c | -rw-r--r-- | 11.1 KB |
elevator.c | -rw-r--r-- | 23.1 KB |
genhd.c | -rw-r--r-- | 43.5 KB |
ioctl.c | -rw-r--r-- | 10.2 KB |
noop-iosched.c | -rw-r--r-- | 2.5 KB |
partition-generic.c | -rw-r--r-- | 14.0 KB |
scsi_ioctl.c | -rw-r--r-- | 19.6 KB |
Computing file changes ...