Merge branch 'block'

2026-10-14 05:55:17 +00:00 · 2010-12-22 23:29:40 -06:00 · 2010-12-22 23:29:40 -06:00 · ce82ba8047
commit ce82ba8047
parent 5f7bb3a439 047b7bdab9
50 changed files with 1206 additions and 1038 deletions
--- a/Documentation/cgroups/blkio-controller.txt
+++ b/Documentation/cgroups/blkio-controller.txt
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
--- a/block/blk-core.c
+++ b/block/blk-core.c
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
--- a/block/genhd.c
+++ b/block/genhd.c
--- a/block/ioctl.c
+++ b/block/ioctl.c
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
--- a/drivers/s390/block/dasd_genhd.c
+++ b/drivers/s390/block/dasd_genhd.c
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
--- a/drivers/scsi/sr.h
+++ b/drivers/scsi/sr.h
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
--- a/fs/logfs/dev_bdev.c
+++ b/fs/logfs/dev_bdev.c
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
--- a/fs/splice.c
+++ b/fs/splice.c
--- a/fs/super.c
+++ b/fs/super.c
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
--- a/mm/swapfile.c
+++ b/mm/swapfile.c