* [GIT PULL] core block bits for 2.6.38
@ 2011-01-13 13:52 Jens Axboe
2011-01-13 19:21 ` Alasdair G Kergon
0 siblings, 1 reply; 8+ messages in thread
From: Jens Axboe @ 2011-01-13 13:52 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kernel@vger.kernel.org
Hi Linus,
Below are the core block bits for 2.6.38.
- Various optimizations and cleanups for CFQ from Gui and Shaohua
- Allow for hierarchical cgroups from Vivek.
- The in-kernel polling framework from Tejun. This means we can finally
get cdrom notifications correct.
The remainder is mostly little things here and there, cleanups and so on.
Apart from Tejuns works, there's nothing earth shattering in here.
Please pull.
git://git.kernel.dk/linux-2.6-block.git for-2.6.38/core
Bart Van Assche (1):
block: Clean up exit_io_context() source code.
Gui Jianfeng (3):
cfq-iosched: Get rid of st->active
cfq-iosched: Get rid of on_st flag
cfq-iosched: don't check cfqg in choose_service_tree()
Jeff Moyer (1):
block: trace event block fix unassigned field
Jens Axboe (9):
Merge branch 'v2.6.37-rc2' into for-2.6.38/core
Merge branch 'for-2.6.38/rc2-holder' into for-2.6.38/core
Merge branch 'cleanup-bd_claim' of git://git.kernel.org/.../tj/misc into for-2.6.38/core
cdrom: export cdrom_check_events()
Fix compile warnings due to missing removal of a 'ret' variable
Revert "sd: implement sd_check_events()"
block: add internal hd part table references
block: ensure that completion error gets properly traced
Merge branch 'for-2.6.38/event-handling' into for-2.6.38/core
Jerome Marchand (2):
kref: add kref_test_and_get
block: fix accounting bug on cross partition merges
Kay Sievers (1):
block: export 'ro' sysfs attribute for partitions
Mathieu Desnoyers (1):
blktrace: add missing probe argument to block_bio_complete
Michał Mirosław (1):
fs/splice: Pull buf->ops->confirm() from splice_from_pipe actors
Mike Snitzer (1):
block: Rename "block_remap" tracepoint to "block_bio_remap" to clarify the event.
Shaohua Li (6):
cfq-iosched: do cleanup
cfq-iosched: schedule dispatch for noidle queue
cfq-iosched: don't idle if a deep seek queue is slow
cfq-iosched: don't schedule a dispatch for a non-idle queue
block cfq: don't use atomic_t for cfq_queue
block cfq: don't use atomic_t for cfq_group
Shaohua Li writes (1):
block cfq: select new workload if priority changed
Tejun Heo (17):
mtd: fix bdev exclusive open bugs in block2mtd::add_device()
btrfs: close_bdev_exclusive() should use the same @flags as the matching open_bdev_exclusive()
block: simplify holder symlink handling
block: make blkdev_get/put() handle exclusive access
block: reorganize claim/release implementation
block: check bdev_read_only() from blkdev_get()
block: clean up blkdev_get() wrappers and their users
block: kill genhd_media_change_notify()
block: move register_disk() and del_gendisk() to block/genhd.c
implement in-kernel gendisk events handling
cdrom: add ->check_events() support
scsi: fix TUR error handling in sr_media_change()
scsi: replace sr_test_unit_ready() with scsi_test_unit_ready()
sr: implement sr_check_events()
sd: implement sd_check_events()
block: make kblockd_workqueue smarter
bio-integrity: mark kintegrityd_wq highpri and CPU intensive
Vivek Goyal (1):
blk-cgroup: Allow creation of hierarchical cgroups
Yang Zhang (2):
block: convert !IS_ERR(p) && p to !IS_ERR_NOR_NULL(p)
fs/block: type signature of major_to_index(int) to major_to_index(unsigned)
Documentation/cgroups/blkio-controller.txt | 27 +
block/blk-cgroup.c | 4 -
block/blk-core.c | 40 ++-
block/blk-ioc.c | 5 +-
block/blk-merge.c | 3 +-
block/cfq-iosched.c | 112 +++--
block/genhd.c | 550 +++++++++++++++++++--
block/ioctl.c | 5 +-
drivers/block/drbd/drbd_int.h | 2 -
drivers/block/drbd/drbd_main.c | 7 +-
drivers/block/drbd/drbd_nl.c | 105 ++---
drivers/block/loop.c | 6 +-
drivers/block/pktcdvd.c | 22 +-
drivers/cdrom/cdrom.c | 56 ++-
drivers/char/raw.c | 14 +-
drivers/md/dm-table.c | 20 +-
drivers/md/dm.c | 6 +-
drivers/md/md.c | 16 +-
drivers/mtd/devices/block2mtd.c | 10 +-
drivers/s390/block/dasd_genhd.c | 2 +-
drivers/scsi/scsi_lib.c | 13 +-
drivers/scsi/sd.c | 10 +-
drivers/scsi/sr.c | 174 ++++---
drivers/scsi/sr.h | 3 +-
drivers/scsi/sr_ioctl.c | 2 +-
drivers/usb/gadget/storage_common.c | 7 +-
fs/bio-integrity.c | 7 +-
fs/block_dev.c | 741 ++++++++++------------------
fs/btrfs/volumes.c | 28 +-
fs/btrfs/volumes.h | 2 +-
fs/char_dev.c | 2 +-
fs/ext3/super.c | 12 +-
fs/ext4/super.c | 12 +-
fs/gfs2/ops_fstype.c | 8 +-
fs/jfs/jfs_logmgr.c | 17 +-
fs/logfs/dev_bdev.c | 7 +-
fs/nfsd/vfs.c | 5 -
fs/nilfs2/super.c | 8 +-
fs/ocfs2/cluster/heartbeat.c | 2 +-
fs/partitions/check.c | 106 +----
fs/reiserfs/journal.c | 21 +-
fs/splice.c | 43 +--
fs/super.c | 19 +-
fs/xfs/linux-2.6/xfs_super.c | 5 +-
include/linux/blkdev.h | 5 +-
include/linux/cdrom.h | 6 +
include/linux/fs.h | 26 +-
include/linux/genhd.h | 45 ++-
include/scsi/scsi.h | 1 +
include/trace/events/block.h | 12 +-
kernel/power/swap.c | 5 +-
kernel/trace/blktrace.c | 37 +-
mm/swapfile.c | 7 +-
53 files changed, 1324 insertions(+), 1086 deletions(-)
--
Jens Axboe
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [GIT PULL] core block bits for 2.6.38
2011-01-13 13:52 [GIT PULL] core block bits for 2.6.38 Jens Axboe
@ 2011-01-13 19:21 ` Alasdair G Kergon
2011-01-13 19:26 ` Linus Torvalds
2011-01-13 19:31 ` Jens Axboe
0 siblings, 2 replies; 8+ messages in thread
From: Alasdair G Kergon @ 2011-01-13 19:21 UTC (permalink / raw)
To: Jens Axboe; +Cc: Linus Torvalds, Tejun Heo, linux-kernel@vger.kernel.org
On Thu, Jan 13, 2011 at 02:52:39PM +0100, Jens Axboe wrote:
> Below are the core block bits for 2.6.38.
> Tejun Heo (17):
> block: simplify holder symlink handling
This one was found to be causing problems in linux-next yesterday:
http://permalink.gmane.org/gmane.linux.file-systems/50132
Perhaps you could drop it for now until a solution's found?
Thanks,
Alasdair
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [GIT PULL] core block bits for 2.6.38
2011-01-13 19:21 ` Alasdair G Kergon
@ 2011-01-13 19:26 ` Linus Torvalds
2011-01-13 19:32 ` Jens Axboe
2011-01-13 19:31 ` Jens Axboe
1 sibling, 1 reply; 8+ messages in thread
From: Linus Torvalds @ 2011-01-13 19:26 UTC (permalink / raw)
To: Alasdair G Kergon, Jens Axboe, Tejun Heo,
linux-kernel@vger.kernel.org
On Thu, Jan 13, 2011 at 11:21 AM, Alasdair G Kergon <agk@redhat.com> wrote:
>
> This one was found to be causing problems in linux-next yesterday:
> http://permalink.gmane.org/gmane.linux.file-systems/50132
>
> Perhaps you could drop it for now until a solution's found?
Sadly I already merged.
And yes, I get the warning too. Tejun?
Linus
---
[ 5.177189] dracut: Reading all physical volumes. This may take a while...
[ 5.178962] dracut: Found volume group "VolGroup" using metadata type lvm2
[ 5.206183] dracut: The link /dev/VolGroup/lv_root should had been
created by udev but it was not found. Falling back to direct link
creation.
[ 5.217826] ------------[ cut here ]------------
[ 5.219670] WARNING: at fs/block_dev.c:824 bd_link_disk_holder+0x4f/0xfb()
[ 5.221542] Hardware name: System Product Name
[ 5.223402] Modules linked in: [last unloaded: scsi_wait_scan]
[ 5.225278] Pid: 1771, comm: lvm Not tainted 2.6.37-06858-g581548d-dirty #45
[ 5.227150] Call Trace:
[ 5.229021] [<ffffffff81039df8>] ? warn_slowpath_common+0x80/0x98
[ 5.230872] [<ffffffff81039e25>] ? warn_slowpath_null+0x15/0x17
[ 5.232776] [<ffffffff810ee8a7>] ? bd_link_disk_holder+0x4f/0xfb
[ 5.234647] [<ffffffff810efa67>] ? blkdev_get_by_dev+0x2c/0x48
[ 5.236523] [<ffffffff813e3ee2>] ? open_dev+0x54/0x7b
[ 5.238386] [<ffffffff813e42be>] ? dm_get_device+0x11a/0x1b6
[ 5.240261] [<ffffffff813e55b6>] ? linear_ctr+0x9e/0xda
[ 5.242113] [<ffffffff813e48ba>] ? dm_table_add_target+0x149/0x1d4
[ 5.243964] [<ffffffff813e69ef>] ? table_load+0xf0/0x27b
[ 5.245826] [<ffffffff813e68ff>] ? table_load+0x0/0x27b
[ 5.247677] [<ffffffff813e775f>] ? ctl_ioctl+0x1c8/0x220
[ 5.249512] [<ffffffff813e77c5>] ? dm_ctl_ioctl+0xe/0x12
[ 5.251338] [<ffffffff810d3f6e>] ? do_vfs_ioctl+0x4aa/0x4eb
[ 5.253125] [<ffffffff810c5ef5>] ? fget_light+0x13a/0x31a
[ 5.254952] [<ffffffff8100202c>] ? sysret_check+0x27/0x62
[ 5.256750] [<ffffffff810d4000>] ? sys_ioctl+0x51/0x75
[ 5.258548] [<ffffffff81001ffb>] ? system_call_fastpath+0x16/0x1b
[ 5.260311] ---[ end trace c76cd8f047b9c147 ]---
[ 5.269327] dracut: The link /dev/VolGroup/lv_swap should had been
created by udev but it was not found. Falling back to direct link
creation.
[ 5.271528] dracut: 2 logical volume(s) in volume group "VolGroup" now active
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [GIT PULL] core block bits for 2.6.38
2011-01-13 19:21 ` Alasdair G Kergon
2011-01-13 19:26 ` Linus Torvalds
@ 2011-01-13 19:31 ` Jens Axboe
1 sibling, 0 replies; 8+ messages in thread
From: Jens Axboe @ 2011-01-13 19:31 UTC (permalink / raw)
To: Alasdair G Kergon; +Cc: Linus Torvalds, Tejun Heo, linux-kernel@vger.kernel.org
On 2011-01-13 20:21, Alasdair G Kergon wrote:
> On Thu, Jan 13, 2011 at 02:52:39PM +0100, Jens Axboe wrote:
>> Below are the core block bits for 2.6.38.
>
>> Tejun Heo (17):
>> block: simplify holder symlink handling
>
> This one was found to be causing problems in linux-next yesterday:
> http://permalink.gmane.org/gmane.linux.file-systems/50132
>
> Perhaps you could drop it for now until a solution's found?
Oh, nobody told me about that. I have an addon, give me a few minutes to
push it out.
--
Jens Axboe
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [GIT PULL] core block bits for 2.6.38
2011-01-13 19:26 ` Linus Torvalds
@ 2011-01-13 19:32 ` Jens Axboe
2011-01-13 20:05 ` Tejun Heo
0 siblings, 1 reply; 8+ messages in thread
From: Jens Axboe @ 2011-01-13 19:32 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Alasdair G Kergon, Tejun Heo, linux-kernel@vger.kernel.org
On 2011-01-13 20:26, Linus Torvalds wrote:
> On Thu, Jan 13, 2011 at 11:21 AM, Alasdair G Kergon <agk@redhat.com> wrote:
>>
>> This one was found to be causing problems in linux-next yesterday:
>> http://permalink.gmane.org/gmane.linux.file-systems/50132
>>
>> Perhaps you could drop it for now until a solution's found?
>
> Sadly I already merged.
>
> And yes, I get the warning too. Tejun?
I see Tejun already posted a fix, but Milan says it does not work.
Tejun, any updates?
--
Jens Axboe
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [GIT PULL] core block bits for 2.6.38
2011-01-13 19:32 ` Jens Axboe
@ 2011-01-13 20:05 ` Tejun Heo
2011-01-13 21:43 ` Alasdair G Kergon
0 siblings, 1 reply; 8+ messages in thread
From: Tejun Heo @ 2011-01-13 20:05 UTC (permalink / raw)
To: Jens Axboe
Cc: Linus Torvalds, Alasdair G Kergon, linux-kernel@vger.kernel.org
On Thu, Jan 13, 2011 at 8:32 PM, Jens Axboe <jaxboe@fusionio.com> wrote:
> I see Tejun already posted a fix, but Milan says it does not work.
> Tejun, any updates?
Hmmm... seems like I missed something. Unfortunately, it's already a
bit too late here. I'll get back to it tomorrow afternoon. The issue
is mostly cosmetic so if it can wait a day or two I don't think
reverting is necessary.
Thank you.
--
tejun
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [GIT PULL] core block bits for 2.6.38
2011-01-13 20:05 ` Tejun Heo
@ 2011-01-13 21:43 ` Alasdair G Kergon
2011-01-13 21:54 ` Milan Broz
0 siblings, 1 reply; 8+ messages in thread
From: Alasdair G Kergon @ 2011-01-13 21:43 UTC (permalink / raw)
To: Tejun Heo
Cc: Jens Axboe, Linus Torvalds, Alasdair G Kergon,
linux-kernel@vger.kernel.org
On Thu, Jan 13, 2011 at 09:05:40PM +0100, Tejun Heo wrote:
> On Thu, Jan 13, 2011 at 8:32 PM, Jens Axboe <jaxboe@fusionio.com> wrote:
> > I see Tejun already posted a fix, but Milan says it does not work.
> > Tejun, any updates?
>
> Hmmm... seems like I missed something. Unfortunately, it's already a
> bit too late here. I'll get back to it tomorrow afternoon. The issue
> is mostly cosmetic so if it can wait a day or two I don't think
> reverting is necessary.
It's only cosmetic if your system is not relying upon userspace programs
that rely upon it:) My vote would be for reverting the patch for now
so we can be sure the existing userspace functionality continues to work
in -rc1.
Alasdair
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [GIT PULL] core block bits for 2.6.38
2011-01-13 21:43 ` Alasdair G Kergon
@ 2011-01-13 21:54 ` Milan Broz
0 siblings, 0 replies; 8+ messages in thread
From: Milan Broz @ 2011-01-13 21:54 UTC (permalink / raw)
To: Alasdair G Kergon, Tejun Heo, Jens Axboe, Linus Torvalds,
linux-kernel@vger.kernel.org
On 01/13/2011 10:43 PM, Alasdair G Kergon wrote:
> On Thu, Jan 13, 2011 at 09:05:40PM +0100, Tejun Heo wrote:
>> On Thu, Jan 13, 2011 at 8:32 PM, Jens Axboe <jaxboe@fusionio.com> wrote:
>>> I see Tejun already posted a fix, but Milan says it does not work.
>>> Tejun, any updates?
>>
>> Hmmm... seems like I missed something. Unfortunately, it's already a
>> bit too late here. I'll get back to it tomorrow afternoon. The issue
>> is mostly cosmetic so if it can wait a day or two I don't think
>> reverting is necessary.
>
> It's only cosmetic if your system is not relying upon userspace programs
> that rely upon it:) My vote would be for reverting the patch for now
> so we can be sure the existing userspace functionality continues to work
> in -rc1.
It is not cosmetic, it breaks core lvm functionality, see my lvresize test case
in the reporting thread. Sorry, but this should be fixed soon or reverted...
http://article.gmane.org/gmane.linux.raid/31164
I thought it is just warning but when testing the fix it shows that
the problem is worse than warning.
Milan
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-01-13 21:55 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-13 13:52 [GIT PULL] core block bits for 2.6.38 Jens Axboe
2011-01-13 19:21 ` Alasdair G Kergon
2011-01-13 19:26 ` Linus Torvalds
2011-01-13 19:32 ` Jens Axboe
2011-01-13 20:05 ` Tejun Heo
2011-01-13 21:43 ` Alasdair G Kergon
2011-01-13 21:54 ` Milan Broz
2011-01-13 19:31 ` Jens Axboe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.