Frederic Weisbecker [Wed, 30 Dec 2009 06:40:39 +0000 (07:40 +0100)]
reiserfs: Safely acquire i_mutex from xattr_rmdir
Relax the reiserfs lock before taking the inode mutex from
xattr_rmdir() to avoid the usual reiserfs lock <-> inode mutex
bad dependency.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Tested-by: Christian Kujau <lists@nerdbynature.de>
Cc: Alexander Beregalov <a.beregalov@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Frederic Weisbecker [Wed, 30 Dec 2009 06:28:58 +0000 (07:28 +0100)]
reiserfs: Safely acquire i_mutex from reiserfs_for_each_xattr
Relax the reiserfs lock before taking the inode mutex from
reiserfs_for_each_xattr() to avoid the usual bad dependencies:
=======================================================
[ INFO: possible circular locking dependency detected ]
2.6.32-atom #179
-------------------------------------------------------
rm/3242 is trying to acquire lock:
(&sb->s_type->i_mutex_key#4/3){+.+.+.}, at: [<
c11428ef>] reiserfs_for_each_xattr+0x23f/0x290
but task is already holding lock:
(&REISERFS_SB(s)->lock){+.+.+.}, at: [<
c1143389>] reiserfs_write_lock+0x29/0x40
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&REISERFS_SB(s)->lock){+.+.+.}:
[<
c105ea7f>] __lock_acquire+0x11ff/0x19e0
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c1401aab>] mutex_lock_nested+0x5b/0x340
[<
c1143339>] reiserfs_write_lock_once+0x29/0x50
[<
c1117022>] reiserfs_lookup+0x62/0x140
[<
c10bd85f>] __lookup_hash+0xef/0x110
[<
c10bf21d>] lookup_one_len+0x8d/0xc0
[<
c1141e3a>] open_xa_dir+0xea/0x1b0
[<
c1142720>] reiserfs_for_each_xattr+0x70/0x290
[<
c11429ba>] reiserfs_delete_xattrs+0x1a/0x60
[<
c111ea2f>] reiserfs_delete_inode+0x9f/0x150
[<
c10c9c32>] generic_delete_inode+0xa2/0x170
[<
c10c9d4f>] generic_drop_inode+0x4f/0x70
[<
c10c8b07>] iput+0x47/0x50
[<
c10c0965>] do_unlinkat+0xd5/0x160
[<
c10c0b13>] sys_unlinkat+0x23/0x40
[<
c1002ec4>] sysenter_do_call+0x12/0x32
-> #0 (&sb->s_type->i_mutex_key#4/3){+.+.+.}:
[<
c105f176>] __lock_acquire+0x18f6/0x19e0
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c1401aab>] mutex_lock_nested+0x5b/0x340
[<
c11428ef>] reiserfs_for_each_xattr+0x23f/0x290
[<
c11429ba>] reiserfs_delete_xattrs+0x1a/0x60
[<
c111ea2f>] reiserfs_delete_inode+0x9f/0x150
[<
c10c9c32>] generic_delete_inode+0xa2/0x170
[<
c10c9d4f>] generic_drop_inode+0x4f/0x70
[<
c10c8b07>] iput+0x47/0x50
[<
c10c0965>] do_unlinkat+0xd5/0x160
[<
c10c0b13>] sys_unlinkat+0x23/0x40
[<
c1002ec4>] sysenter_do_call+0x12/0x32
other info that might help us debug this:
1 lock held by rm/3242:
#0: (&REISERFS_SB(s)->lock){+.+.+.}, at: [<
c1143389>] reiserfs_write_lock+0x29/0x40
stack backtrace:
Pid: 3242, comm: rm Not tainted 2.6.32-atom #179
Call Trace:
[<
c13ffa13>] ? printk+0x18/0x1a
[<
c105d33a>] print_circular_bug+0xca/0xd0
[<
c105f176>] __lock_acquire+0x18f6/0x19e0
[<
c105c932>] ? mark_held_locks+0x62/0x80
[<
c105cc3b>] ? trace_hardirqs_on+0xb/0x10
[<
c1401098>] ? mutex_unlock+0x8/0x10
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c11428ef>] ? reiserfs_for_each_xattr+0x23f/0x290
[<
c11428ef>] ? reiserfs_for_each_xattr+0x23f/0x290
[<
c1401aab>] mutex_lock_nested+0x5b/0x340
[<
c11428ef>] ? reiserfs_for_each_xattr+0x23f/0x290
[<
c11428ef>] reiserfs_for_each_xattr+0x23f/0x290
[<
c1143180>] ? delete_one_xattr+0x0/0x100
[<
c11429ba>] reiserfs_delete_xattrs+0x1a/0x60
[<
c1143339>] ? reiserfs_write_lock_once+0x29/0x50
[<
c111ea2f>] reiserfs_delete_inode+0x9f/0x150
[<
c11b0d4f>] ? _atomic_dec_and_lock+0x4f/0x70
[<
c111e990>] ? reiserfs_delete_inode+0x0/0x150
[<
c10c9c32>] generic_delete_inode+0xa2/0x170
[<
c10c9d4f>] generic_drop_inode+0x4f/0x70
[<
c10c8b07>] iput+0x47/0x50
[<
c10c0965>] do_unlinkat+0xd5/0x160
[<
c1401098>] ? mutex_unlock+0x8/0x10
[<
c10c3e0d>] ? vfs_readdir+0x7d/0xb0
[<
c10c3af0>] ? filldir64+0x0/0xf0
[<
c1002ef3>] ? sysenter_exit+0xf/0x16
[<
c105cbe4>] ? trace_hardirqs_on_caller+0x124/0x170
[<
c10c0b13>] sys_unlinkat+0x23/0x40
[<
c1002ec4>] sysenter_do_call+0x12/0x32
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Tested-by: Christian Kujau <lists@nerdbynature.de>
Cc: Alexander Beregalov <a.beregalov@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Frederic Weisbecker [Wed, 30 Dec 2009 06:26:28 +0000 (07:26 +0100)]
reiserfs: Fix journal mutex <-> inode mutex lock inversion
We need to relax the reiserfs lock before locking the inode mutex
from xattr_unlink(), otherwise we'll face the usual bad dependencies:
=======================================================
[ INFO: possible circular locking dependency detected ]
2.6.32-atom #178
-------------------------------------------------------
rm/3202 is trying to acquire lock:
(&journal->j_mutex){+.+...}, at: [<
c113c234>] do_journal_begin_r+0x94/0x360
but task is already holding lock:
(&sb->s_type->i_mutex_key#4/2){+.+...}, at: [<
c1142a67>] xattr_unlink+0x57/0xb0
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #2 (&sb->s_type->i_mutex_key#4/2){+.+...}:
[<
c105ea7f>] __lock_acquire+0x11ff/0x19e0
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c1401a7b>] mutex_lock_nested+0x5b/0x340
[<
c1142a67>] xattr_unlink+0x57/0xb0
[<
c1143179>] delete_one_xattr+0x29/0x100
[<
c11427bb>] reiserfs_for_each_xattr+0x10b/0x290
[<
c11429ba>] reiserfs_delete_xattrs+0x1a/0x60
[<
c111ea2f>] reiserfs_delete_inode+0x9f/0x150
[<
c10c9c32>] generic_delete_inode+0xa2/0x170
[<
c10c9d4f>] generic_drop_inode+0x4f/0x70
[<
c10c8b07>] iput+0x47/0x50
[<
c10c0965>] do_unlinkat+0xd5/0x160
[<
c10c0b13>] sys_unlinkat+0x23/0x40
[<
c1002ec4>] sysenter_do_call+0x12/0x32
-> #1 (&REISERFS_SB(s)->lock){+.+.+.}:
[<
c105ea7f>] __lock_acquire+0x11ff/0x19e0
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c1401a7b>] mutex_lock_nested+0x5b/0x340
[<
c1143359>] reiserfs_write_lock+0x29/0x40
[<
c113c23c>] do_journal_begin_r+0x9c/0x360
[<
c113c680>] journal_begin+0x80/0x130
[<
c1127363>] reiserfs_remount+0x223/0x4e0
[<
c10b6dd6>] do_remount_sb+0xa6/0x140
[<
c10ce6a0>] do_mount+0x560/0x750
[<
c10ce914>] sys_mount+0x84/0xb0
[<
c1002ec4>] sysenter_do_call+0x12/0x32
-> #0 (&journal->j_mutex){+.+...}:
[<
c105f176>] __lock_acquire+0x18f6/0x19e0
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c1401a7b>] mutex_lock_nested+0x5b/0x340
[<
c113c234>] do_journal_begin_r+0x94/0x360
[<
c113c680>] journal_begin+0x80/0x130
[<
c1116d63>] reiserfs_unlink+0x83/0x2e0
[<
c1142a74>] xattr_unlink+0x64/0xb0
[<
c1143179>] delete_one_xattr+0x29/0x100
[<
c11427bb>] reiserfs_for_each_xattr+0x10b/0x290
[<
c11429ba>] reiserfs_delete_xattrs+0x1a/0x60
[<
c111ea2f>] reiserfs_delete_inode+0x9f/0x150
[<
c10c9c32>] generic_delete_inode+0xa2/0x170
[<
c10c9d4f>] generic_drop_inode+0x4f/0x70
[<
c10c8b07>] iput+0x47/0x50
[<
c10c0965>] do_unlinkat+0xd5/0x160
[<
c10c0b13>] sys_unlinkat+0x23/0x40
[<
c1002ec4>] sysenter_do_call+0x12/0x32
other info that might help us debug this:
2 locks held by rm/3202:
#0: (&sb->s_type->i_mutex_key#4/3){+.+.+.}, at: [<
c114274b>] reiserfs_for_each_xattr+0x9b/0x290
#1: (&sb->s_type->i_mutex_key#4/2){+.+...}, at: [<
c1142a67>] xattr_unlink+0x57/0xb0
stack backtrace:
Pid: 3202, comm: rm Not tainted 2.6.32-atom #178
Call Trace:
[<
c13ff9e3>] ? printk+0x18/0x1a
[<
c105d33a>] print_circular_bug+0xca/0xd0
[<
c105f176>] __lock_acquire+0x18f6/0x19e0
[<
c1142a67>] ? xattr_unlink+0x57/0xb0
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c113c234>] ? do_journal_begin_r+0x94/0x360
[<
c113c234>] ? do_journal_begin_r+0x94/0x360
[<
c1401a7b>] mutex_lock_nested+0x5b/0x340
[<
c113c234>] ? do_journal_begin_r+0x94/0x360
[<
c113c234>] do_journal_begin_r+0x94/0x360
[<
c10411b6>] ? run_timer_softirq+0x1a6/0x220
[<
c103cb00>] ? __do_softirq+0x50/0x140
[<
c113c680>] journal_begin+0x80/0x130
[<
c103cba2>] ? __do_softirq+0xf2/0x140
[<
c104f72f>] ? hrtimer_interrupt+0xdf/0x220
[<
c1116d63>] reiserfs_unlink+0x83/0x2e0
[<
c105c932>] ? mark_held_locks+0x62/0x80
[<
c11b8d08>] ? trace_hardirqs_on_thunk+0xc/0x10
[<
c1002fd8>] ? restore_all_notrace+0x0/0x18
[<
c1142a67>] ? xattr_unlink+0x57/0xb0
[<
c1142a74>] xattr_unlink+0x64/0xb0
[<
c1143179>] delete_one_xattr+0x29/0x100
[<
c11427bb>] reiserfs_for_each_xattr+0x10b/0x290
[<
c1143150>] ? delete_one_xattr+0x0/0x100
[<
c1401cb9>] ? mutex_lock_nested+0x299/0x340
[<
c11429ba>] reiserfs_delete_xattrs+0x1a/0x60
[<
c1143309>] ? reiserfs_write_lock_once+0x29/0x50
[<
c111ea2f>] reiserfs_delete_inode+0x9f/0x150
[<
c11b0d1f>] ? _atomic_dec_and_lock+0x4f/0x70
[<
c111e990>] ? reiserfs_delete_inode+0x0/0x150
[<
c10c9c32>] generic_delete_inode+0xa2/0x170
[<
c10c9d4f>] generic_drop_inode+0x4f/0x70
[<
c10c8b07>] iput+0x47/0x50
[<
c10c0965>] do_unlinkat+0xd5/0x160
[<
c1401068>] ? mutex_unlock+0x8/0x10
[<
c10c3e0d>] ? vfs_readdir+0x7d/0xb0
[<
c10c3af0>] ? filldir64+0x0/0xf0
[<
c1002ef3>] ? sysenter_exit+0xf/0x16
[<
c105cbe4>] ? trace_hardirqs_on_caller+0x124/0x170
[<
c10c0b13>] sys_unlinkat+0x23/0x40
[<
c1002ec4>] sysenter_do_call+0x12/0x32
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Tested-by: Christian Kujau <lists@nerdbynature.de>
Cc: Alexander Beregalov <a.beregalov@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Frederic Weisbecker [Wed, 30 Dec 2009 06:12:03 +0000 (07:12 +0100)]
reiserfs: Fix unwanted recursive reiserfs lock in reiserfs_unlink()
reiserfs_unlink() may or may not be called under the reiserfs
lock.
But it also takes the reiserfs lock and can then acquire it
recursively which leads to do_journal_begin_r() that fails to
relax the reiserfs lock before grabbing the journal mutex,
creating an unexpected lock inversion.
We need to ensure reiserfs_unlink() won't get the reiserfs lock
recursively using reiserfs_write_lock_once().
This fixes the following warning that precedes a lock inversion
report (reiserfs lock <-> journal mutex).
------------[ cut here ]------------
WARNING: at fs/reiserfs/lock.c:95 reiserfs_lock_check_recursive+0x3a/0x50()
Hardware name: MS-7418
Unwanted recursive reiserfs lock!
Pid: 3208, comm: dbench Not tainted 2.6.32-atom #177
Call Trace:
[<
c114327a>] ? reiserfs_lock_check_recursive+0x3a/0x50
[<
c114327a>] ? reiserfs_lock_check_recursive+0x3a/0x50
[<
c10373a7>] warn_slowpath_common+0x67/0xc0
[<
c114327a>] ? reiserfs_lock_check_recursive+0x3a/0x50
[<
c1037446>] warn_slowpath_fmt+0x26/0x30
[<
c114327a>] reiserfs_lock_check_recursive+0x3a/0x50
[<
c113c213>] do_journal_begin_r+0x83/0x360
[<
c105eb16>] ? __lock_acquire+0x1296/0x19e0
[<
c1142a57>] ? xattr_unlink+0x57/0xb0
[<
c113c670>] journal_begin+0x80/0x130
[<
c1116d5d>] reiserfs_unlink+0x7d/0x2d0
[<
c1142a57>] ? xattr_unlink+0x57/0xb0
[<
c1142a57>] ? xattr_unlink+0x57/0xb0
[<
c1142a57>] ? xattr_unlink+0x57/0xb0
[<
c1142a64>] xattr_unlink+0x64/0xb0
[<
c1143169>] delete_one_xattr+0x29/0x100
[<
c11427ab>] reiserfs_for_each_xattr+0x10b/0x290
[<
c1143140>] ? delete_one_xattr+0x0/0x100
[<
c1401ca9>] ? mutex_lock_nested+0x299/0x340
[<
c11429aa>] reiserfs_delete_xattrs+0x1a/0x60
[<
c11432f9>] ? reiserfs_write_lock_once+0x29/0x50
[<
c111ea1f>] reiserfs_delete_inode+0x9f/0x150
[<
c11b0d0f>] ? _atomic_dec_and_lock+0x4f/0x70
[<
c111e980>] ? reiserfs_delete_inode+0x0/0x150
[<
c10c9c32>] generic_delete_inode+0xa2/0x170
[<
c10c9d4f>] generic_drop_inode+0x4f/0x70
[<
c10c8b07>] iput+0x47/0x50
[<
c10c0965>] do_unlinkat+0xd5/0x160
[<
c10505c6>] ? up_read+0x16/0x30
[<
c1022ab7>] ? do_page_fault+0x187/0x330
[<
c1002fd8>] ? restore_all_notrace+0x0/0x18
[<
c1022930>] ? do_page_fault+0x0/0x330
[<
c105cbe4>] ? trace_hardirqs_on_caller+0x124/0x170
[<
c10c0a00>] sys_unlink+0x10/0x20
[<
c1002ec4>] sysenter_do_call+0x12/0x32
---[ end trace
2e35d71a6cc69d0c ]---
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Tested-by: Christian Kujau <lists@nerdbynature.de>
Cc: Alexander Beregalov <a.beregalov@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Frederic Weisbecker [Wed, 30 Dec 2009 06:03:53 +0000 (07:03 +0100)]
reiserfs: Relax lock before open xattr dir in reiserfs_xattr_set_handle()
We call xattr_lookup() from reiserfs_xattr_get(). We then hold
the reiserfs lock when we grab the i_mutex. But later, we may
relax the reiserfs lock, creating dependency inversion between
both locks.
The lookups and creation jobs ar already protected by the
inode mutex, so we can safely relax the reiserfs lock, dropping
the unwanted reiserfs lock -> i_mutex dependency, as shown
in the following lockdep report:
=======================================================
[ INFO: possible circular locking dependency detected ]
2.6.32-atom #173
-------------------------------------------------------
cp/3204 is trying to acquire lock:
(&REISERFS_SB(s)->lock){+.+.+.}, at: [<
c11432b9>] reiserfs_write_lock_once+0x29/0x50
but task is already holding lock:
(&sb->s_type->i_mutex_key#4/3){+.+.+.}, at: [<
c1141e18>] open_xa_dir+0xd8/0x1b0
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&sb->s_type->i_mutex_key#4/3){+.+.+.}:
[<
c105ea7f>] __lock_acquire+0x11ff/0x19e0
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c1401a2b>] mutex_lock_nested+0x5b/0x340
[<
c1141d83>] open_xa_dir+0x43/0x1b0
[<
c1142722>] reiserfs_for_each_xattr+0x62/0x260
[<
c114299a>] reiserfs_delete_xattrs+0x1a/0x60
[<
c111ea1f>] reiserfs_delete_inode+0x9f/0x150
[<
c10c9c32>] generic_delete_inode+0xa2/0x170
[<
c10c9d4f>] generic_drop_inode+0x4f/0x70
[<
c10c8b07>] iput+0x47/0x50
[<
c10c0965>] do_unlinkat+0xd5/0x160
[<
c10c0a00>] sys_unlink+0x10/0x20
[<
c1002ec4>] sysenter_do_call+0x12/0x32
-> #0 (&REISERFS_SB(s)->lock){+.+.+.}:
[<
c105f176>] __lock_acquire+0x18f6/0x19e0
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c1401a2b>] mutex_lock_nested+0x5b/0x340
[<
c11432b9>] reiserfs_write_lock_once+0x29/0x50
[<
c1117012>] reiserfs_lookup+0x62/0x140
[<
c10bd85f>] __lookup_hash+0xef/0x110
[<
c10bf21d>] lookup_one_len+0x8d/0xc0
[<
c1141e2a>] open_xa_dir+0xea/0x1b0
[<
c1141fe5>] xattr_lookup+0x15/0x160
[<
c1142476>] reiserfs_xattr_get+0x56/0x2a0
[<
c1144042>] reiserfs_get_acl+0xa2/0x360
[<
c114461a>] reiserfs_cache_default_acl+0x3a/0x160
[<
c111789c>] reiserfs_mkdir+0x6c/0x2c0
[<
c10bea96>] vfs_mkdir+0xd6/0x180
[<
c10c0c10>] sys_mkdirat+0xc0/0xd0
[<
c10c0c40>] sys_mkdir+0x20/0x30
[<
c1002ec4>] sysenter_do_call+0x12/0x32
other info that might help us debug this:
2 locks held by cp/3204:
#0: (&sb->s_type->i_mutex_key#4/1){+.+.+.}, at: [<
c10bd8d6>] lookup_create+0x26/0xa0
#1: (&sb->s_type->i_mutex_key#4/3){+.+.+.}, at: [<
c1141e18>] open_xa_dir+0xd8/0x1b0
stack backtrace:
Pid: 3204, comm: cp Not tainted 2.6.32-atom #173
Call Trace:
[<
c13ff993>] ? printk+0x18/0x1a
[<
c105d33a>] print_circular_bug+0xca/0xd0
[<
c105f176>] __lock_acquire+0x18f6/0x19e0
[<
c105d3aa>] ? check_usage+0x6a/0x460
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c11432b9>] ? reiserfs_write_lock_once+0x29/0x50
[<
c11432b9>] ? reiserfs_write_lock_once+0x29/0x50
[<
c1401a2b>] mutex_lock_nested+0x5b/0x340
[<
c11432b9>] ? reiserfs_write_lock_once+0x29/0x50
[<
c11432b9>] reiserfs_write_lock_once+0x29/0x50
[<
c1117012>] reiserfs_lookup+0x62/0x140
[<
c105ccca>] ? debug_check_no_locks_freed+0x8a/0x140
[<
c105cbe4>] ? trace_hardirqs_on_caller+0x124/0x170
[<
c10bd85f>] __lookup_hash+0xef/0x110
[<
c10bf21d>] lookup_one_len+0x8d/0xc0
[<
c1141e2a>] open_xa_dir+0xea/0x1b0
[<
c1141fe5>] xattr_lookup+0x15/0x160
[<
c1142476>] reiserfs_xattr_get+0x56/0x2a0
[<
c1144042>] reiserfs_get_acl+0xa2/0x360
[<
c10ca2e7>] ? new_inode+0x27/0xa0
[<
c114461a>] reiserfs_cache_default_acl+0x3a/0x160
[<
c1402eb7>] ? _spin_unlock+0x27/0x40
[<
c111789c>] reiserfs_mkdir+0x6c/0x2c0
[<
c10c7cb8>] ? __d_lookup+0x108/0x190
[<
c105c932>] ? mark_held_locks+0x62/0x80
[<
c1401c8d>] ? mutex_lock_nested+0x2bd/0x340
[<
c10bd17a>] ? generic_permission+0x1a/0xa0
[<
c11788fe>] ? security_inode_permission+0x1e/0x20
[<
c10bea96>] vfs_mkdir+0xd6/0x180
[<
c10c0c10>] sys_mkdirat+0xc0/0xd0
[<
c10505c6>] ? up_read+0x16/0x30
[<
c1002fd8>] ? restore_all_notrace+0x0/0x18
[<
c10c0c40>] sys_mkdir+0x20/0x30
[<
c1002ec4>] sysenter_do_call+0x12/0x32
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Tested-by: Christian Kujau <lists@nerdbynature.de>
Cc: Alexander Beregalov <a.beregalov@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Frederic Weisbecker [Wed, 30 Dec 2009 04:56:08 +0000 (05:56 +0100)]
reiserfs: Relax reiserfs lock while freeing the journal
Keeping the reiserfs lock while freeing the journal on
umount path triggers a lock inversion between bdev->bd_mutex
and the reiserfs lock.
We don't need the reiserfs lock at this stage. The filesystem
is not usable anymore, and there are no more pending commits,
everything got flushed (even this operation was done in parallel
and didn't required the reiserfs lock from the current process).
This fixes the following lockdep report:
=======================================================
[ INFO: possible circular locking dependency detected ]
2.6.32-atom #172
-------------------------------------------------------
umount/3904 is trying to acquire lock:
(&bdev->bd_mutex){+.+.+.}, at: [<
c10de2c2>] __blkdev_put+0x22/0x160
but task is already holding lock:
(&REISERFS_SB(s)->lock){+.+.+.}, at: [<
c1143279>] reiserfs_write_lock+0x29/0x40
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #3 (&REISERFS_SB(s)->lock){+.+.+.}:
[<
c105ea7f>] __lock_acquire+0x11ff/0x19e0
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c140199b>] mutex_lock_nested+0x5b/0x340
[<
c1143229>] reiserfs_write_lock_once+0x29/0x50
[<
c111c485>] reiserfs_get_block+0x85/0x1620
[<
c10e1040>] do_mpage_readpage+0x1f0/0x6d0
[<
c10e1640>] mpage_readpages+0xc0/0x100
[<
c1119b89>] reiserfs_readpages+0x19/0x20
[<
c108f1ec>] __do_page_cache_readahead+0x1bc/0x260
[<
c108f2b8>] ra_submit+0x28/0x40
[<
c1087e3e>] filemap_fault+0x40e/0x420
[<
c109b5fd>] __do_fault+0x3d/0x430
[<
c109d47e>] handle_mm_fault+0x12e/0x790
[<
c1022a65>] do_page_fault+0x135/0x330
[<
c1403663>] error_code+0x6b/0x70
[<
c10ef9ca>] load_elf_binary+0x82a/0x1a10
[<
c10ba130>] search_binary_handler+0x90/0x1d0
[<
c10bb70f>] do_execve+0x1df/0x250
[<
c1001746>] sys_execve+0x46/0x70
[<
c1002fa5>] syscall_call+0x7/0xb
-> #2 (&mm->mmap_sem){++++++}:
[<
c105ea7f>] __lock_acquire+0x11ff/0x19e0
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c109b1ab>] might_fault+0x8b/0xb0
[<
c11b8f52>] copy_to_user+0x32/0x70
[<
c10c3b94>] filldir64+0xa4/0xf0
[<
c1109116>] sysfs_readdir+0x116/0x210
[<
c10c3e1d>] vfs_readdir+0x8d/0xb0
[<
c10c3ea9>] sys_getdents64+0x69/0xb0
[<
c1002ec4>] sysenter_do_call+0x12/0x32
-> #1 (sysfs_mutex){+.+.+.}:
[<
c105ea7f>] __lock_acquire+0x11ff/0x19e0
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c140199b>] mutex_lock_nested+0x5b/0x340
[<
c110951c>] sysfs_addrm_start+0x2c/0xb0
[<
c1109aa0>] create_dir+0x40/0x90
[<
c1109b1b>] sysfs_create_dir+0x2b/0x50
[<
c11b2352>] kobject_add_internal+0xc2/0x1b0
[<
c11b2531>] kobject_add_varg+0x31/0x50
[<
c11b25ac>] kobject_add+0x2c/0x60
[<
c1258294>] device_add+0x94/0x560
[<
c11036ea>] add_partition+0x18a/0x2a0
[<
c110418a>] rescan_partitions+0x33a/0x450
[<
c10de5bf>] __blkdev_get+0x12f/0x2d0
[<
c10de76a>] blkdev_get+0xa/0x10
[<
c11034b8>] register_disk+0x108/0x130
[<
c11a87a9>] add_disk+0xd9/0x130
[<
c12998e5>] sd_probe_async+0x105/0x1d0
[<
c10528af>] async_thread+0xcf/0x230
[<
c104bfd4>] kthread+0x74/0x80
[<
c1003aab>] kernel_thread_helper+0x7/0x3c
-> #0 (&bdev->bd_mutex){+.+.+.}:
[<
c105f176>] __lock_acquire+0x18f6/0x19e0
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c140199b>] mutex_lock_nested+0x5b/0x340
[<
c10de2c2>] __blkdev_put+0x22/0x160
[<
c10de40a>] blkdev_put+0xa/0x10
[<
c113ce22>] free_journal_ram+0xd2/0x130
[<
c113ea18>] do_journal_release+0x98/0x190
[<
c113eb2a>] journal_release+0xa/0x10
[<
c1128eb6>] reiserfs_put_super+0x36/0x130
[<
c10b776f>] generic_shutdown_super+0x4f/0xe0
[<
c10b7825>] kill_block_super+0x25/0x40
[<
c11255df>] reiserfs_kill_sb+0x7f/0x90
[<
c10b7f4a>] deactivate_super+0x7a/0x90
[<
c10cccd8>] mntput_no_expire+0x98/0xd0
[<
c10ccfcc>] sys_umount+0x4c/0x310
[<
c10cd2a9>] sys_oldumount+0x19/0x20
[<
c1002ec4>] sysenter_do_call+0x12/0x32
other info that might help us debug this:
2 locks held by umount/3904:
#0: (&type->s_umount_key#30){+++++.}, at: [<
c10b7f45>] deactivate_super+0x75/0x90
#1: (&REISERFS_SB(s)->lock){+.+.+.}, at: [<
c1143279>] reiserfs_write_lock+0x29/0x40
stack backtrace:
Pid: 3904, comm: umount Not tainted 2.6.32-atom #172
Call Trace:
[<
c13ff903>] ? printk+0x18/0x1a
[<
c105d33a>] print_circular_bug+0xca/0xd0
[<
c105f176>] __lock_acquire+0x18f6/0x19e0
[<
c108b66f>] ? free_pcppages_bulk+0x1f/0x250
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c10de2c2>] ? __blkdev_put+0x22/0x160
[<
c10de2c2>] ? __blkdev_put+0x22/0x160
[<
c140199b>] mutex_lock_nested+0x5b/0x340
[<
c10de2c2>] ? __blkdev_put+0x22/0x160
[<
c105c932>] ? mark_held_locks+0x62/0x80
[<
c10afe12>] ? kfree+0x92/0xd0
[<
c10de2c2>] __blkdev_put+0x22/0x160
[<
c105cc3b>] ? trace_hardirqs_on+0xb/0x10
[<
c10de40a>] blkdev_put+0xa/0x10
[<
c113ce22>] free_journal_ram+0xd2/0x130
[<
c113ea18>] do_journal_release+0x98/0x190
[<
c113eb2a>] journal_release+0xa/0x10
[<
c1128eb6>] reiserfs_put_super+0x36/0x130
[<
c1050596>] ? up_write+0x16/0x30
[<
c10b776f>] generic_shutdown_super+0x4f/0xe0
[<
c10b7825>] kill_block_super+0x25/0x40
[<
c10f41e0>] ? vfs_quota_off+0x0/0x20
[<
c11255df>] reiserfs_kill_sb+0x7f/0x90
[<
c10b7f4a>] deactivate_super+0x7a/0x90
[<
c10cccd8>] mntput_no_expire+0x98/0xd0
[<
c10ccfcc>] sys_umount+0x4c/0x310
[<
c10cd2a9>] sys_oldumount+0x19/0x20
[<
c1002ec4>] sysenter_do_call+0x12/0x32
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Alexander Beregalov <a.beregalov@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Frederic Weisbecker [Wed, 30 Dec 2009 04:06:21 +0000 (05:06 +0100)]
reiserfs: Fix reiserfs lock <-> i_mutex dependency inversion on xattr
While deleting the xattrs of an inode, we hold the reiserfs lock
and grab the inode->i_mutex of the targeted inode and the root
private xattr directory.
Later on, we may relax the reiserfs lock for various reasons, this
creates inverted dependencies.
We can remove the reiserfs lock -> i_mutex dependency by relaxing
the former before calling open_xa_dir(). This is fine because the
lookup and creation of xattr private directories done in
open_xa_dir() are covered by the targeted inode mutexes. And deeper
operations in the tree are still done under the write lock.
This fixes the following lockdep report:
=======================================================
[ INFO: possible circular locking dependency detected ]
2.6.32-atom #173
-------------------------------------------------------
cp/3204 is trying to acquire lock:
(&REISERFS_SB(s)->lock){+.+.+.}, at: [<
c11432b9>] reiserfs_write_lock_once+0x29/0x50
but task is already holding lock:
(&sb->s_type->i_mutex_key#4/3){+.+.+.}, at: [<
c1141e18>] open_xa_dir+0xd8/0x1b0
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&sb->s_type->i_mutex_key#4/3){+.+.+.}:
[<
c105ea7f>] __lock_acquire+0x11ff/0x19e0
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c1401a2b>] mutex_lock_nested+0x5b/0x340
[<
c1141d83>] open_xa_dir+0x43/0x1b0
[<
c1142722>] reiserfs_for_each_xattr+0x62/0x260
[<
c114299a>] reiserfs_delete_xattrs+0x1a/0x60
[<
c111ea1f>] reiserfs_delete_inode+0x9f/0x150
[<
c10c9c32>] generic_delete_inode+0xa2/0x170
[<
c10c9d4f>] generic_drop_inode+0x4f/0x70
[<
c10c8b07>] iput+0x47/0x50
[<
c10c0965>] do_unlinkat+0xd5/0x160
[<
c10c0a00>] sys_unlink+0x10/0x20
[<
c1002ec4>] sysenter_do_call+0x12/0x32
-> #0 (&REISERFS_SB(s)->lock){+.+.+.}:
[<
c105f176>] __lock_acquire+0x18f6/0x19e0
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c1401a2b>] mutex_lock_nested+0x5b/0x340
[<
c11432b9>] reiserfs_write_lock_once+0x29/0x50
[<
c1117012>] reiserfs_lookup+0x62/0x140
[<
c10bd85f>] __lookup_hash+0xef/0x110
[<
c10bf21d>] lookup_one_len+0x8d/0xc0
[<
c1141e2a>] open_xa_dir+0xea/0x1b0
[<
c1141fe5>] xattr_lookup+0x15/0x160
[<
c1142476>] reiserfs_xattr_get+0x56/0x2a0
[<
c1144042>] reiserfs_get_acl+0xa2/0x360
[<
c114461a>] reiserfs_cache_default_acl+0x3a/0x160
[<
c111789c>] reiserfs_mkdir+0x6c/0x2c0
[<
c10bea96>] vfs_mkdir+0xd6/0x180
[<
c10c0c10>] sys_mkdirat+0xc0/0xd0
[<
c10c0c40>] sys_mkdir+0x20/0x30
[<
c1002ec4>] sysenter_do_call+0x12/0x32
other info that might help us debug this:
2 locks held by cp/3204:
#0: (&sb->s_type->i_mutex_key#4/1){+.+.+.}, at: [<
c10bd8d6>] lookup_create+0x26/0xa0
#1: (&sb->s_type->i_mutex_key#4/3){+.+.+.}, at: [<
c1141e18>] open_xa_dir+0xd8/0x1b0
stack backtrace:
Pid: 3204, comm: cp Not tainted 2.6.32-atom #173
Call Trace:
[<
c13ff993>] ? printk+0x18/0x1a
[<
c105d33a>] print_circular_bug+0xca/0xd0
[<
c105f176>] __lock_acquire+0x18f6/0x19e0
[<
c105d3aa>] ? check_usage+0x6a/0x460
[<
c105f2c8>] lock_acquire+0x68/0x90
[<
c11432b9>] ? reiserfs_write_lock_once+0x29/0x50
[<
c11432b9>] ? reiserfs_write_lock_once+0x29/0x50
[<
c1401a2b>] mutex_lock_nested+0x5b/0x340
[<
c11432b9>] ? reiserfs_write_lock_once+0x29/0x50
[<
c11432b9>] reiserfs_write_lock_once+0x29/0x50
[<
c1117012>] reiserfs_lookup+0x62/0x140
[<
c105ccca>] ? debug_check_no_locks_freed+0x8a/0x140
[<
c105cbe4>] ? trace_hardirqs_on_caller+0x124/0x170
[<
c10bd85f>] __lookup_hash+0xef/0x110
[<
c10bf21d>] lookup_one_len+0x8d/0xc0
[<
c1141e2a>] open_xa_dir+0xea/0x1b0
[<
c1141fe5>] xattr_lookup+0x15/0x160
[<
c1142476>] reiserfs_xattr_get+0x56/0x2a0
[<
c1144042>] reiserfs_get_acl+0xa2/0x360
[<
c10ca2e7>] ? new_inode+0x27/0xa0
[<
c114461a>] reiserfs_cache_default_acl+0x3a/0x160
[<
c1402eb7>] ? _spin_unlock+0x27/0x40
[<
c111789c>] reiserfs_mkdir+0x6c/0x2c0
[<
c10c7cb8>] ? __d_lookup+0x108/0x190
[<
c105c932>] ? mark_held_locks+0x62/0x80
[<
c1401c8d>] ? mutex_lock_nested+0x2bd/0x340
[<
c10bd17a>] ? generic_permission+0x1a/0xa0
[<
c11788fe>] ? security_inode_permission+0x1e/0x20
[<
c10bea96>] vfs_mkdir+0xd6/0x180
[<
c10c0c10>] sys_mkdirat+0xc0/0xd0
[<
c10505c6>] ? up_read+0x16/0x30
[<
c1002fd8>] ? restore_all_notrace+0x0/0x18
[<
c10c0c40>] sys_mkdir+0x20/0x30
[<
c1002ec4>] sysenter_do_call+0x12/0x32
v2: Don't drop reiserfs_mutex_lock_nested_safe() as we'll still
need it later
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Tested-by: Christian Kujau <lists@nerdbynature.de>
Cc: Alexander Beregalov <a.beregalov@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Frederic Weisbecker [Wed, 30 Dec 2009 02:20:19 +0000 (03:20 +0100)]
reiserfs: Warn on lock relax if taken recursively
When we relax the reiserfs lock to avoid creating unwanted
dependencies against others locks while grabbing these,
we want to ensure it has not been taken recursively, otherwise
the lock won't be really relaxed. Only its depth will be decreased.
The unwanted dependency would then actually happen.
To prevent from that, add a reiserfs_lock_check_recursive() call
in the places that need it.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Alexander Beregalov <a.beregalov@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Frederic Weisbecker [Tue, 29 Dec 2009 23:39:22 +0000 (00:39 +0100)]
reiserfs: Fix reiserfs lock <-> i_xattr_sem dependency inversion
i_xattr_sem depends on the reiserfs lock. But after we grab
i_xattr_sem, we may relax/relock the reiserfs lock while waiting
on a freezed filesystem, creating a dependency inversion between
the two locks.
In order to avoid the i_xattr_sem -> reiserfs lock dependency, let's
create a reiserfs_down_read_safe() that acts like
reiserfs_mutex_lock_safe(): relax the reiserfs lock while grabbing
another lock to avoid undesired dependencies induced by the
heivyweight reiserfs lock.
This fixes the following warning:
[ 990.005931] =======================================================
[ 990.012373] [ INFO: possible circular locking dependency detected ]
[ 990.013233] 2.6.33-rc1 #1
[ 990.013233] -------------------------------------------------------
[ 990.013233] dbench/1891 is trying to acquire lock:
[ 990.013233] (&REISERFS_SB(s)->lock){+.+.+.}, at: [<
ffffffff81159505>] reiserfs_write_lock+0x35/0x50
[ 990.013233]
[ 990.013233] but task is already holding lock:
[ 990.013233] (&REISERFS_I(inode)->i_xattr_sem){+.+.+.}, at: [<
ffffffff8115899a>] reiserfs_xattr_set_handle+0x8a/0x470
[ 990.013233]
[ 990.013233] which lock already depends on the new lock.
[ 990.013233]
[ 990.013233]
[ 990.013233] the existing dependency chain (in reverse order) is:
[ 990.013233]
[ 990.013233] -> #1 (&REISERFS_I(inode)->i_xattr_sem){+.+.+.}:
[ 990.013233] [<
ffffffff81063afc>] __lock_acquire+0xf9c/0x1560
[ 990.013233] [<
ffffffff8106414f>] lock_acquire+0x8f/0xb0
[ 990.013233] [<
ffffffff814ac194>] down_write+0x44/0x80
[ 990.013233] [<
ffffffff8115899a>] reiserfs_xattr_set_handle+0x8a/0x470
[ 990.013233] [<
ffffffff81158e30>] reiserfs_xattr_set+0xb0/0x150
[ 990.013233] [<
ffffffff8115a6aa>] user_set+0x8a/0x90
[ 990.013233] [<
ffffffff8115901a>] reiserfs_setxattr+0xaa/0xb0
[ 990.013233] [<
ffffffff810e2596>] __vfs_setxattr_noperm+0x36/0xa0
[ 990.013233] [<
ffffffff810e26bc>] vfs_setxattr+0xbc/0xc0
[ 990.013233] [<
ffffffff810e2780>] setxattr+0xc0/0x150
[ 990.013233] [<
ffffffff810e289d>] sys_fsetxattr+0x8d/0xa0
[ 990.013233] [<
ffffffff81002dab>] system_call_fastpath+0x16/0x1b
[ 990.013233]
[ 990.013233] -> #0 (&REISERFS_SB(s)->lock){+.+.+.}:
[ 990.013233] [<
ffffffff81063e30>] __lock_acquire+0x12d0/0x1560
[ 990.013233] [<
ffffffff8106414f>] lock_acquire+0x8f/0xb0
[ 990.013233] [<
ffffffff814aba77>] __mutex_lock_common+0x47/0x3b0
[ 990.013233] [<
ffffffff814abebe>] mutex_lock_nested+0x3e/0x50
[ 990.013233] [<
ffffffff81159505>] reiserfs_write_lock+0x35/0x50
[ 990.013233] [<
ffffffff811340e5>] reiserfs_prepare_write+0x45/0x180
[ 990.013233] [<
ffffffff81158bb6>] reiserfs_xattr_set_handle+0x2a6/0x470
[ 990.013233] [<
ffffffff81158e30>] reiserfs_xattr_set+0xb0/0x150
[ 990.013233] [<
ffffffff8115a6aa>] user_set+0x8a/0x90
[ 990.013233] [<
ffffffff8115901a>] reiserfs_setxattr+0xaa/0xb0
[ 990.013233] [<
ffffffff810e2596>] __vfs_setxattr_noperm+0x36/0xa0
[ 990.013233] [<
ffffffff810e26bc>] vfs_setxattr+0xbc/0xc0
[ 990.013233] [<
ffffffff810e2780>] setxattr+0xc0/0x150
[ 990.013233] [<
ffffffff810e289d>] sys_fsetxattr+0x8d/0xa0
[ 990.013233] [<
ffffffff81002dab>] system_call_fastpath+0x16/0x1b
[ 990.013233]
[ 990.013233] other info that might help us debug this:
[ 990.013233]
[ 990.013233] 2 locks held by dbench/1891:
[ 990.013233] #0: (&sb->s_type->i_mutex_key#12){+.+.+.}, at: [<
ffffffff810e2678>] vfs_setxattr+0x78/0xc0
[ 990.013233] #1: (&REISERFS_I(inode)->i_xattr_sem){+.+.+.}, at: [<
ffffffff8115899a>] reiserfs_xattr_set_handle+0x8a/0x470
[ 990.013233]
[ 990.013233] stack backtrace:
[ 990.013233] Pid: 1891, comm: dbench Not tainted 2.6.33-rc1 #1
[ 990.013233] Call Trace:
[ 990.013233] [<
ffffffff81061639>] print_circular_bug+0xe9/0xf0
[ 990.013233] [<
ffffffff81063e30>] __lock_acquire+0x12d0/0x1560
[ 990.013233] [<
ffffffff8115899a>] ? reiserfs_xattr_set_handle+0x8a/0x470
[ 990.013233] [<
ffffffff8106414f>] lock_acquire+0x8f/0xb0
[ 990.013233] [<
ffffffff81159505>] ? reiserfs_write_lock+0x35/0x50
[ 990.013233] [<
ffffffff8115899a>] ? reiserfs_xattr_set_handle+0x8a/0x470
[ 990.013233] [<
ffffffff814aba77>] __mutex_lock_common+0x47/0x3b0
[ 990.013233] [<
ffffffff81159505>] ? reiserfs_write_lock+0x35/0x50
[ 990.013233] [<
ffffffff81159505>] ? reiserfs_write_lock+0x35/0x50
[ 990.013233] [<
ffffffff81062592>] ? mark_held_locks+0x72/0xa0
[ 990.013233] [<
ffffffff814ab81d>] ? __mutex_unlock_slowpath+0xbd/0x140
[ 990.013233] [<
ffffffff810628ad>] ? trace_hardirqs_on_caller+0x14d/0x1a0
[ 990.013233] [<
ffffffff814abebe>] mutex_lock_nested+0x3e/0x50
[ 990.013233] [<
ffffffff81159505>] reiserfs_write_lock+0x35/0x50
[ 990.013233] [<
ffffffff811340e5>] reiserfs_prepare_write+0x45/0x180
[ 990.013233] [<
ffffffff81158bb6>] reiserfs_xattr_set_handle+0x2a6/0x470
[ 990.013233] [<
ffffffff81158e30>] reiserfs_xattr_set+0xb0/0x150
[ 990.013233] [<
ffffffff814abcb4>] ? __mutex_lock_common+0x284/0x3b0
[ 990.013233] [<
ffffffff8115a6aa>] user_set+0x8a/0x90
[ 990.013233] [<
ffffffff8115901a>] reiserfs_setxattr+0xaa/0xb0
[ 990.013233] [<
ffffffff810e2596>] __vfs_setxattr_noperm+0x36/0xa0
[ 990.013233] [<
ffffffff810e26bc>] vfs_setxattr+0xbc/0xc0
[ 990.013233] [<
ffffffff810e2780>] setxattr+0xc0/0x150
[ 990.013233] [<
ffffffff81056018>] ? sched_clock_cpu+0xb8/0x100
[ 990.013233] [<
ffffffff8105eded>] ? trace_hardirqs_off+0xd/0x10
[ 990.013233] [<
ffffffff810560a3>] ? cpu_clock+0x43/0x50
[ 990.013233] [<
ffffffff810c6820>] ? fget+0xb0/0x110
[ 990.013233] [<
ffffffff810c6770>] ? fget+0x0/0x110
[ 990.013233] [<
ffffffff81002ddc>] ? sysret_check+0x27/0x62
[ 990.013233] [<
ffffffff810e289d>] sys_fsetxattr+0x8d/0xa0
[ 990.013233] [<
ffffffff81002dab>] system_call_fastpath+0x16/0x1b
Reported-and-tested-by: Christian Kujau <lists@nerdbynature.de>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Alexander Beregalov <a.beregalov@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Frederic Weisbecker [Tue, 29 Dec 2009 20:51:15 +0000 (21:51 +0100)]
reiserfs: Fix remaining in-reclaim-fs <-> reclaim-fs-on locking inversion
Commit
500f5a0bf5f0624dae34307010e240ec090e4cde
(reiserfs: Fix possible recursive lock) fixed a vmalloc under reiserfs
lock that triggered a lockdep warning because of a
IN-FS-RECLAIM <-> RECLAIM-FS-ON locking dependency inversion.
But this patch has ommitted another vmalloc call in the same path
that allocates the journal. Relax the lock for this one too.
Reported-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Frederic Weisbecker [Wed, 16 Dec 2009 22:25:50 +0000 (23:25 +0100)]
reiserfs: Fix reiserfs lock <-> inode mutex dependency inversion
The reiserfs lock -> inode mutex dependency gets inverted when we
relax the lock while walking to the tree.
To fix this, use a specialized version of reiserfs_mutex_lock_safe
that takes care of mutex subclasses. Then we can grab the inode
mutex with I_MUTEX_XATTR subclass without any reiserfs lock
dependency.
This fixes the following report:
[ INFO: possible circular locking dependency detected ]
2.6.32-06793-gf405425-dirty #2
-------------------------------------------------------
mv/18566 is trying to acquire lock:
(&REISERFS_SB(s)->lock){+.+.+.}, at: [<
c1110708>] reiserfs_write_lock+0x28=
/0x40
but task is already holding lock:
(&sb->s_type->i_mutex_key#5/3){+.+.+.}, at: [<
c111033c>]
reiserfs_for_each_xattr+0x10c/0x380
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&sb->s_type->i_mutex_key#5/3){+.+.+.}:
[<
c104f723>] validate_chain+0xa23/0xf70
[<
c1050155>] __lock_acquire+0x4e5/0xa70
[<
c105075a>] lock_acquire+0x7a/0xa0
[<
c134c76f>] mutex_lock_nested+0x5f/0x2b0
[<
c11102b4>] reiserfs_for_each_xattr+0x84/0x380
[<
c1110615>] reiserfs_delete_xattrs+0x15/0x50
[<
c10ef57f>] reiserfs_delete_inode+0x8f/0x140
[<
c10a565c>] generic_delete_inode+0x9c/0x150
[<
c10a574d>] generic_drop_inode+0x3d/0x60
[<
c10a4667>] iput+0x47/0x50
[<
c109cc0b>] do_unlinkat+0xdb/0x160
[<
c109cca0>] sys_unlink+0x10/0x20
[<
c1002c50>] sysenter_do_call+0x12/0x36
-> #0 (&REISERFS_SB(s)->lock){+.+.+.}:
[<
c104fc68>] validate_chain+0xf68/0xf70
[<
c1050155>] __lock_acquire+0x4e5/0xa70
[<
c105075a>] lock_acquire+0x7a/0xa0
[<
c134c76f>] mutex_lock_nested+0x5f/0x2b0
[<
c1110708>] reiserfs_write_lock+0x28/0x40
[<
c1103d6b>] search_by_key+0x1f7b/0x21b0
[<
c10e73ef>] search_by_entry_key+0x1f/0x3b0
[<
c10e77f7>] reiserfs_find_entry+0x77/0x400
[<
c10e81e5>] reiserfs_lookup+0x85/0x130
[<
c109a144>] __lookup_hash+0xb4/0x110
[<
c109b763>] lookup_one_len+0xb3/0x100
[<
c1110350>] reiserfs_for_each_xattr+0x120/0x380
[<
c1110615>] reiserfs_delete_xattrs+0x15/0x50
[<
c10ef57f>] reiserfs_delete_inode+0x8f/0x140
[<
c10a565c>] generic_delete_inode+0x9c/0x150
[<
c10a574d>] generic_drop_inode+0x3d/0x60
[<
c10a4667>] iput+0x47/0x50
[<
c10a1c4f>] dentry_iput+0x6f/0xf0
[<
c10a1d74>] d_kill+0x24/0x50
[<
c10a396b>] dput+0x5b/0x120
[<
c109ca89>] sys_renameat+0x1b9/0x230
[<
c109cb28>] sys_rename+0x28/0x30
[<
c1002c50>] sysenter_do_call+0x12/0x36
other info that might help us debug this:
2 locks held by mv/18566:
#0: (&sb->s_type->i_mutex_key#5/1){+.+.+.}, at: [<
c109b6ac>]
lock_rename+0xcc/0xd0
#1: (&sb->s_type->i_mutex_key#5/3){+.+.+.}, at: [<
c111033c>]
reiserfs_for_each_xattr+0x10c/0x380
stack backtrace:
Pid: 18566, comm: mv Tainted: G C 2.6.32-06793-gf405425-dirty #2
Call Trace:
[<
c134b252>] ? printk+0x18/0x1e
[<
c104e790>] print_circular_bug+0xc0/0xd0
[<
c104fc68>] validate_chain+0xf68/0xf70
[<
c104c8cb>] ? trace_hardirqs_off+0xb/0x10
[<
c1050155>] __lock_acquire+0x4e5/0xa70
[<
c105075a>] lock_acquire+0x7a/0xa0
[<
c1110708>] ? reiserfs_write_lock+0x28/0x40
[<
c134c76f>] mutex_lock_nested+0x5f/0x2b0
[<
c1110708>] ? reiserfs_write_lock+0x28/0x40
[<
c1110708>] ? reiserfs_write_lock+0x28/0x40
[<
c134b60a>] ? schedule+0x27a/0x440
[<
c1110708>] reiserfs_write_lock+0x28/0x40
[<
c1103d6b>] search_by_key+0x1f7b/0x21b0
[<
c1050176>] ? __lock_acquire+0x506/0xa70
[<
c1051267>] ? lock_release_non_nested+0x1e7/0x340
[<
c1110708>] ? reiserfs_write_lock+0x28/0x40
[<
c104e354>] ? trace_hardirqs_on_caller+0x124/0x170
[<
c104e3ab>] ? trace_hardirqs_on+0xb/0x10
[<
c1042a55>] ? T.316+0x15/0x1a0
[<
c1042d2d>] ? sched_clock_cpu+0x9d/0x100
[<
c10e73ef>] search_by_entry_key+0x1f/0x3b0
[<
c134bf2a>] ? __mutex_unlock_slowpath+0x9a/0x120
[<
c104e354>] ? trace_hardirqs_on_caller+0x124/0x170
[<
c10e77f7>] reiserfs_find_entry+0x77/0x400
[<
c10e81e5>] reiserfs_lookup+0x85/0x130
[<
c1042d2d>] ? sched_clock_cpu+0x9d/0x100
[<
c109a144>] __lookup_hash+0xb4/0x110
[<
c109b763>] lookup_one_len+0xb3/0x100
[<
c1110350>] reiserfs_for_each_xattr+0x120/0x380
[<
c110ffe0>] ? delete_one_xattr+0x0/0x1c0
[<
c1003342>] ? math_error+0x22/0x150
[<
c1110708>] ? reiserfs_write_lock+0x28/0x40
[<
c1110615>] reiserfs_delete_xattrs+0x15/0x50
[<
c1110708>] ? reiserfs_write_lock+0x28/0x40
[<
c10ef57f>] reiserfs_delete_inode+0x8f/0x140
[<
c10a561f>] ? generic_delete_inode+0x5f/0x150
[<
c10ef4f0>] ? reiserfs_delete_inode+0x0/0x140
[<
c10a565c>] generic_delete_inode+0x9c/0x150
[<
c10a574d>] generic_drop_inode+0x3d/0x60
[<
c10a4667>] iput+0x47/0x50
[<
c10a1c4f>] dentry_iput+0x6f/0xf0
[<
c10a1d74>] d_kill+0x24/0x50
[<
c10a396b>] dput+0x5b/0x120
[<
c109ca89>] sys_renameat+0x1b9/0x230
[<
c1042d2d>] ? sched_clock_cpu+0x9d/0x100
[<
c104c8cb>] ? trace_hardirqs_off+0xb/0x10
[<
c1042dde>] ? cpu_clock+0x4e/0x60
[<
c1350825>] ? do_page_fault+0x155/0x370
[<
c1041816>] ? up_read+0x16/0x30
[<
c1350825>] ? do_page_fault+0x155/0x370
[<
c109cb28>] sys_rename+0x28/0x30
[<
c1002c50>] sysenter_do_call+0x12/0x36
Reported-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Frederic Weisbecker [Sun, 13 Dec 2009 22:32:06 +0000 (23:32 +0100)]
reiserfs: Fix reiserfs lock and journal lock inversion dependency
When we were using the bkl, we didn't care about dependencies against
other locks, but the mutex conversion created new ones, which is why
we have reiserfs_mutex_lock_safe(), which unlocks the reiserfs lock
before acquiring another mutex.
But this trick actually fails if we have acquired the reiserfs lock
recursively, as we try to unlock it to acquire the new mutex without
inverted dependency, but we eventually only decrease its depth.
This happens in the case of a nested inode creation/deletion.
Say we have no space left on the device, we create an inode
and tak the lock but fail to create its entry, then we release the
inode using iput(), which calls reiserfs_delete_inode() that takes
the reiserfs lock recursively. The path eventually ends up in
journal_begin() where we try to take the journal safely but we
fail because of the reiserfs lock recursion:
[ INFO: possible circular locking dependency detected ]
2.6.32-06486-g053fe57 #2
-------------------------------------------------------
vi/23454 is trying to acquire lock:
(&journal->j_mutex){+.+...}, at: [<
c110dac4>] do_journal_begin_r+0x64/0x2f0
but task is already holding lock:
(&REISERFS_SB(s)->lock){+.+.+.}, at: [<
c11106a8>] reiserfs_write_lock+0x28/0x40
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&REISERFS_SB(s)->lock){+.+.+.}:
[<
c104f8f3>] validate_chain+0xa23/0xf70
[<
c1050325>] __lock_acquire+0x4e5/0xa70
[<
c105092a>] lock_acquire+0x7a/0xa0
[<
c134c78f>] mutex_lock_nested+0x5f/0x2b0
[<
c11106a8>] reiserfs_write_lock+0x28/0x40
[<
c110dacb>] do_journal_begin_r+0x6b/0x2f0
[<
c110ddcf>] journal_begin+0x7f/0x120
[<
c10f76c2>] reiserfs_remount+0x212/0x4d0
[<
c1093997>] do_remount_sb+0x67/0x140
[<
c10a9ca6>] do_mount+0x436/0x6b0
[<
c10a9f86>] sys_mount+0x66/0xa0
[<
c1002c50>] sysenter_do_call+0x12/0x36
-> #0 (&journal->j_mutex){+.+...}:
[<
c104fe38>] validate_chain+0xf68/0xf70
[<
c1050325>] __lock_acquire+0x4e5/0xa70
[<
c105092a>] lock_acquire+0x7a/0xa0
[<
c134c78f>] mutex_lock_nested+0x5f/0x2b0
[<
c110dac4>] do_journal_begin_r+0x64/0x2f0
[<
c110ddcf>] journal_begin+0x7f/0x120
[<
c10ef52f>] reiserfs_delete_inode+0x9f/0x140
[<
c10a55fc>] generic_delete_inode+0x9c/0x150
[<
c10a56ed>] generic_drop_inode+0x3d/0x60
[<
c10a4607>] iput+0x47/0x50
[<
c10e915c>] reiserfs_create+0x16c/0x1c0
[<
c109a9c1>] vfs_create+0xc1/0x130
[<
c109dbec>] do_filp_open+0x81c/0x920
[<
c109004f>] do_sys_open+0x4f/0x110
[<
c1090179>] sys_open+0x29/0x40
[<
c1002c50>] sysenter_do_call+0x12/0x36
other info that might help us debug this:
2 locks held by vi/23454:
#0: (&sb->s_type->i_mutex_key#5){+.+.+.}, at: [<
c109d64e>]
do_filp_open+0x27e/0x920
#1: (&REISERFS_SB(s)->lock){+.+.+.}, at: [<
c11106a8>]
reiserfs_write_lock+0x28/0x40
stack backtrace:
Pid: 23454, comm: vi Not tainted 2.6.32-06486-g053fe57 #2
Call Trace:
[<
c134b202>] ? printk+0x18/0x1e
[<
c104e960>] print_circular_bug+0xc0/0xd0
[<
c104fe38>] validate_chain+0xf68/0xf70
[<
c104ca9b>] ? trace_hardirqs_off+0xb/0x10
[<
c1050325>] __lock_acquire+0x4e5/0xa70
[<
c105092a>] lock_acquire+0x7a/0xa0
[<
c110dac4>] ? do_journal_begin_r+0x64/0x2f0
[<
c134c78f>] mutex_lock_nested+0x5f/0x2b0
[<
c110dac4>] ? do_journal_begin_r+0x64/0x2f0
[<
c110dac4>] ? do_journal_begin_r+0x64/0x2f0
[<
c110ff80>] ? delete_one_xattr+0x0/0x1c0
[<
c110dac4>] do_journal_begin_r+0x64/0x2f0
[<
c110ddcf>] journal_begin+0x7f/0x120
[<
c11105b5>] ? reiserfs_delete_xattrs+0x15/0x50
[<
c10ef52f>] reiserfs_delete_inode+0x9f/0x140
[<
c10a55bf>] ? generic_delete_inode+0x5f/0x150
[<
c10ef490>] ? reiserfs_delete_inode+0x0/0x140
[<
c10a55fc>] generic_delete_inode+0x9c/0x150
[<
c10a56ed>] generic_drop_inode+0x3d/0x60
[<
c10a4607>] iput+0x47/0x50
[<
c10e915c>] reiserfs_create+0x16c/0x1c0
[<
c1099a5d>] ? inode_permission+0x7d/0xa0
[<
c109a9c1>] vfs_create+0xc1/0x130
[<
c10e8ff0>] ? reiserfs_create+0x0/0x1c0
[<
c109dbec>] do_filp_open+0x81c/0x920
[<
c104ca9b>] ? trace_hardirqs_off+0xb/0x10
[<
c134dc0d>] ? _spin_unlock+0x1d/0x20
[<
c10a6eea>] ? alloc_fd+0xba/0xf0
[<
c109004f>] do_sys_open+0x4f/0x110
[<
c1090179>] sys_open+0x29/0x40
[<
c1002c50>] sysenter_do_call+0x12/0x36
To fix this, use reiserfs_lock_once() from reiserfs_delete_inode()
which prevents from adding reiserfs lock recursion.
Reported-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Frederic Weisbecker [Sun, 13 Dec 2009 21:48:54 +0000 (22:48 +0100)]
reiserfs: Fix possible recursive lock
While allocating the bitmap using vmalloc, we hold the reiserfs lock,
which makes lockdep later reporting a possible deadlock as we may
swap out pages to allocate memory and then take the reiserfs lock
recursively:
inconsistent {RECLAIM_FS-ON-W} -> {IN-RECLAIM_FS-W} usage.
kswapd0/312 [HC0[0]:SC0[0]:HE1:SE1] takes:
(&REISERFS_SB(s)->lock){+.+.?.}, at: [<
c11108a8>] reiserfs_write_lock+0x28/0x40
{RECLAIM_FS-ON-W} state was registered at:
[<
c104e1c2>] mark_held_locks+0x62/0x90
[<
c104e28a>] lockdep_trace_alloc+0x9a/0xc0
[<
c108e396>] kmem_cache_alloc+0x26/0xf0
[<
c10850ec>] __get_vm_area_node+0x6c/0xf0
[<
c10857de>] __vmalloc_node+0x7e/0xa0
[<
c108597b>] vmalloc+0x2b/0x30
[<
c10e00b9>] reiserfs_init_bitmap_cache+0x39/0x70
[<
c10f8178>] reiserfs_fill_super+0x2e8/0xb90
[<
c1094345>] get_sb_bdev+0x145/0x180
[<
c10f5a11>] get_super_block+0x21/0x30
[<
c10931f0>] vfs_kern_mount+0x40/0xd0
[<
c10932d9>] do_kern_mount+0x39/0xd0
[<
c10a9857>] do_mount+0x2c7/0x6b0
[<
c10a9ca6>] sys_mount+0x66/0xa0
[<
c161589b>] mount_block_root+0xc4/0x245
[<
c1615a75>] mount_root+0x59/0x5f
[<
c1615b8c>] prepare_namespace+0x111/0x14b
[<
c1615269>] kernel_init+0xcf/0xdb
[<
c10031fb>] kernel_thread_helper+0x7/0x1c
This is actually fine for two reasons: we call vmalloc at mount time
then it's not in the swapping out path. Also the reiserfs lock can be
acquired recursively, but since its implementation depends on a mutex,
it's hard and not necessary worth it to teach that to lockdep.
The lock is useless at mount time anyway, at least until we replay the
journal. But let's remove it from this path later as this needs
more thinking and is a sensible change.
For now we can just relax the lock around vmalloc,
Reported-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Frederic Weisbecker [Mon, 7 Dec 2009 06:28:35 +0000 (07:28 +0100)]
Merge commit 'v2.6.32' into reiserfs/kill-bkl
Merge-reason: The tree was based 2.6.31. It's better to be up to date
with 2.6.32. Although no conflicting changes were made in between,
it gives benchmarking results closer to the lastest kernel behaviour.
Linus Torvalds [Thu, 3 Dec 2009 03:51:21 +0000 (19:51 -0800)]
Linux 2.6.32
Julia Lawall [Sun, 9 Aug 2009 09:42:32 +0000 (11:42 +0200)]
VIDEO: Correct use of request_region/request_mem_region
request_region should be used with release_region, not request_mem_region.
Geert Uytterhoeven pointed out that in the case of drivers/video/gbefb.c,
the problem is actually the other way around; request_mem_region should be
used instead of request_region.
The semantic patch that finds/fixes this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@r1@
expression start;
@@
request_region(start,...)
@b1@
expression r1.start;
@@
request_mem_region(start,...)
@depends on !b1@
expression r1.start;
expression E;
@@
- release_mem_region
+ release_region
(start,E)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Atsushi Nemoto [Thu, 3 Sep 2009 13:59:01 +0000 (22:59 +0900)]
SPI: spi_txx9: Fix bit rate calculation
TXx9 SPI bit rate is calculated by:
fBR = (spi-baseclk) / (n + 1)
Fix calculation of min_speed_hz, max_speed_hz and n.
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Linus Torvalds [Wed, 2 Dec 2009 23:41:49 +0000 (15:41 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Correct WM831X_MAX_ISEL_VALUE
Anisse Astier [Tue, 1 Dec 2009 09:14:25 +0000 (01:14 -0800)]
Input: i8042 - add Dell Vostro 1320, 1520 and 1720 to the reset list
These laptops often leave i8042 in a wierd state resulting in non-
operational touchpad and keyboard.
Signed-off-by: Anisse Astier <anisse@astier.eu>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Wed, 2 Dec 2009 23:40:37 +0000 (15:40 -0800)]
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md: revert incorrect fix for read error handling in raid1.
Rusty Russell [Tue, 1 Dec 2009 04:26:44 +0000 (14:56 +1030)]
param: don't complain about unused module parameters.
Jon confirms that recent modprobe will look in /proc/cmdline, so these
cmdline options can still be used.
See http://bugzilla.kernel.org/show_bug.cgi?id=14164
Reported-by: Adam Williamson <awilliam@redhat.com>
Cc: stable@kernel.org
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Wed, 2 Dec 2009 23:39:20 +0000 (15:39 -0800)]
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: RB532: Fix devices.c compilation.
MIPS: Fix MIPS I build.
Linus Torvalds [Wed, 2 Dec 2009 23:38:49 +0000 (15:38 -0800)]
Merge git://git./linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[PATCH] rc32434_wdt: fix compilation failure
[WATCHDOG] rc32434_wdt.c: use resource_size()
Helge Deller [Wed, 2 Dec 2009 23:29:15 +0000 (00:29 +0100)]
modules: don't export section names of empty sections via sysfs
On the parisc architecture we face for each and every loaded kernel module
this kernel "badness warning":
sysfs: cannot create duplicate filename '/module/ac97_bus/sections/.text'
Badness at fs/sysfs/dir.c:487
Reason for that is, that on parisc all kernel modules do have multiple
.text sections due to the usage of the -ffunction-sections compiler flag
which is needed to reach all jump targets on this platform.
An objdump on such a kernel module gives:
Sections:
Idx Name Size VMA LMA File off Algn
0 .note.gnu.build-id
00000024 00000000 00000000 00000034 2**2
CONTENTS, ALLOC, LOAD, READONLY, DATA
1 .text
00000000 00000000 00000000 00000058 2**0
CONTENTS, ALLOC, LOAD, READONLY, CODE
2 .text.ac97_bus_match
0000001c 00000000 00000000 00000058 2**2
CONTENTS, ALLOC, LOAD, READONLY, CODE
3 .text
00000000 00000000 00000000 000000d4 2**0
CONTENTS, ALLOC, LOAD, READONLY, CODE
...
Since the .text sections are empty (size of 0 bytes) and won't be
loaded by the kernel module loader anyway, I don't see a reason
why such sections need to be listed under
/sys/module/<module_name>/sections/<section_name> either.
The attached patch does solve this issue by not exporting section
names which are empty.
This fixes bugzilla http://bugzilla.kernel.org/show_bug.cgi?id=14703
Signed-off-by: Helge Deller <deller@gmx.de>
CC: rusty@rustcorp.com.au
CC: akpm@linux-foundation.org
CC: James.Bottomley@HansenPartnership.com
CC: roland@redhat.com
CC: dave@hiauly1.hia.nrc.ca
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Wed, 2 Dec 2009 20:44:42 +0000 (12:44 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
regulator: Initialise wm831x structure pointor for ISINK driver
Mark Brown [Mon, 30 Nov 2009 14:01:56 +0000 (14:01 +0000)]
regulator: Initialise wm831x structure pointor for ISINK driver
The version that made it into mainline missed the initialisation of the
chip handle.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Florian Fainelli [Wed, 2 Dec 2009 12:07:01 +0000 (13:07 +0100)]
MIPS: RB532: Fix devices.c compilation.
We should now use dev_set_drvdata to set the driver driver_data field.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/747/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Wed, 2 Dec 2009 11:33:03 +0000 (11:33 +0000)]
MIPS: Fix MIPS I build.
Broken by
d63c63e889bbeeaa461a8addf1245f89f3ce4ece (lmo) rsp.
f1e39a4a616cd9981a9decfd5332fd07a01abb8b (kernel.org).
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Patchwork: http://patchwork.linux-mips.org/patch/746/
Linus Torvalds [Wed, 2 Dec 2009 16:21:58 +0000 (08:21 -0800)]
Merge branch 'fix' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6
* 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6:
[ARM] pxamci: call mmc_remove_host() before freeing resources
Daniel Mack [Tue, 1 Dec 2009 17:17:18 +0000 (18:17 +0100)]
[ARM] pxamci: call mmc_remove_host() before freeing resources
mmc_remove_host() will cause the mmc core to switch off the bus power by
eventually calling pxamci_set_ios(). This function uses the regulator or
the GPIO which have been freed already.
This causes the following Oops on module unload.
[ 49.519649] Unable to handle kernel paging request at virtual address
30303a70
[ 49.526878] pgd =
c7084000
[ 49.529563] [
30303a70] *pgd=
00000000
[ 49.533136] Internal error: Oops: 5 [#1]
[ 49.537025] last sysfs file: /sys/devices/platform/pxa27x-ohci/usb1/1-1/1-1:1.0/host0/target0:0:0/0:0:0:0/scsi_level
[ 49.547471] Modules linked in: pxamci(-) eeti_ts
[ 49.552061] CPU: 0 Not tainted (2.6.32-rc8 #322)
[ 49.557001] PC is at regulator_is_enabled+0x3c/0xbc
[ 49.561846] LR is at regulator_is_enabled+0x30/0xbc
[ 49.566691] pc : [<
c01a2448>] lr : [<
c01a243c>] psr:
60000013
[ 49.566702] sp :
c7083e70 ip :
30303a30 fp :
00000000
[ 49.578093] r10:
c705e200 r9 :
c7082000 r8 :
c705e2e0
[ 49.583280] r7 :
c7061340 r6 :
c7061340 r5 :
c7083e70 r4 :
00000000
[ 49.589759] r3 :
c04dc434 r2 :
c04dc434 r1 :
c03eecea r0 :
00000047
[ 49.596241] Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user
[ 49.603329] Control:
0000397f Table:
a7084018 DAC:
00000015
[ 49.609031] Process rmmod (pid: 1101, stack limit = 0xc7082278)
[ 49.614908] Stack: (0xc7083e70 to 0xc7084000)
[ 49.619238] 3e60:
c7082000 c703c4f8 c705ea00 c04f4074
[ 49.627366] 3e80:
00000000 c705e3a0 ffffffff c0247ddc c70361a0 00000000 c705e3a0 ffffffff
[ 49.635499] 3ea0:
c705e200 bf006400 c78c4f00 c705e200 c705e3a0 ffffffff c705e200 ffffffff
[ 49.643633] 3ec0:
c04d8ac8 c02476d0 ffffffff c0247c60 c705e200 c0248678 c705e200 c0249064
[ 49.651765] 3ee0:
ffffffff bf006204 c04d8ad0 c04d8ad0 c04d8ac8 bf007490 00000880 c00440c4
[ 49.659898] 3f00:
0000b748 c01c5708 bf007490 c01c44c8 c04d8ac8 c04d8afc bf007490 c01c4570
[ 49.668031] 3f20:
bf007490 bf00750c c04f4258 c01c37a4 00000000 bf00750c c7083f44 c007b014
[ 49.676162] 3f40:
4000d000 6d617870 08006963 00000001 00000000 c7085000 00000001 00000000
[ 49.684287] 3f60:
4000d000 c7083f8c 00000001 bea01a54 00005401 c7ab1400 c00440c4 00082000
[ 49.692420] 3f80:
bf00750c 00000880 c7083f8c 00000000 4000cfa8 00000000 00000880 bea01cc8
[ 49.700552] 3fa0:
00000081 c0043f40 00000000 00000880 bea01cc8 00000880 00000006 00000000
[ 49.708677] 3fc0:
00000000 00000880 bea01cc8 00000081 00000097 0000cca4 0000b748 00000000
[ 49.716802] 3fe0:
4001a4f0 bea01cc0 00018bf4 4001a4fc 20000010 bea01cc8 a063e021 a063e421
[ 49.724958] [<
c01a2448>] (regulator_is_enabled+0x3c/0xbc) from [<
c0247ddc>] (mmc_regulator_set_ocr+0x14/0xd8)
[ 49.734836] [<
c0247ddc>] (mmc_regulator_set_ocr+0x14/0xd8) from [<
bf006400>] (pxamci_set_ios+0xd8/0x17c [pxamci])
[ 49.745044] [<
bf006400>] (pxamci_set_ios+0xd8/0x17c [pxamci]) from [<
c02476d0>] (mmc_power_off+0x50/0x58)
[ 49.754555] [<
c02476d0>] (mmc_power_off+0x50/0x58) from [<
c0247c60>] (mmc_detach_bus+0x68/0xc4)
[ 49.763207] [<
c0247c60>] (mmc_detach_bus+0x68/0xc4) from [<
c0248678>] (mmc_stop_host+0xd4/0x1bc)
[ 49.771944] [<
c0248678>] (mmc_stop_host+0xd4/0x1bc) from [<
c0249064>] (mmc_remove_host+0xc/0x20)
[ 49.780681] [<
c0249064>] (mmc_remove_host+0xc/0x20) from [<
bf006204>] (pxamci_remove+0xc8/0x174 [pxamci])
[ 49.790211] [<
bf006204>] (pxamci_remove+0xc8/0x174 [pxamci]) from [<
c01c5708>] (platform_drv_remove+0x1c/0x24)
[ 49.800164] [<
c01c5708>] (platform_drv_remove+0x1c/0x24) from [<
c01c44c8>] (__device_release_driver+0x7c/0xc4)
[ 49.810110] [<
c01c44c8>] (__device_release_driver+0x7c/0xc4) from [<
c01c4570>] (driver_detach+0x60/0x8c)
[ 49.819535] [<
c01c4570>] (driver_detach+0x60/0x8c) from [<
c01c37a4>] (bus_remove_driver+0x90/0xcc)
[ 49.828452] [<
c01c37a4>] (bus_remove_driver+0x90/0xcc) from [<
c007b014>] (sys_delete_module+0x1d8/0x254)
[ 49.837891] [<
c007b014>] (sys_delete_module+0x1d8/0x254) from [<
c0043f40>] (ret_fast_syscall+0x0/0x28)
[ 49.847145] Code:
eb06c53a e596c030 e1a0500d e59f106c (
e59c0040)
[ 49.853566] ---[ end trace
b5fa66a00cea142f ]---
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Reported-by: Sven Neumann <s.neumann@raumfeld.com>
Cc: Pierre Ossman <pierre@ossman.eu>
Cc: linux-mmc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: stable@kernel.org
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Florian Fainelli [Wed, 2 Dec 2009 12:21:23 +0000 (13:21 +0100)]
[PATCH] rc32434_wdt: fix compilation failure
This patch fixes the compilation failure of
rc32434 due to a bad module parameter description.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
H Hartley Sweeten [Wed, 25 Nov 2009 02:06:26 +0000 (21:06 -0500)]
[WATCHDOG] rc32434_wdt.c: use resource_size()
The size value passed to ioremap_nocache() is not correct.
Use resource_size() to get the correct value.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Phil Sutter <n0-1@freewrt.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Randy Dunlap [Tue, 1 Dec 2009 21:17:50 +0000 (13:17 -0800)]
sysfs: fix SYSFS_DEPRECATED_V2 prompt
The SYSFS_DEPRECATED_V2 says "remove" older, deprecated features, but it
actually enables them, so correct this confusing, backwards text.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Johannes Weiner [Tue, 1 Dec 2009 21:17:49 +0000 (13:17 -0800)]
rtc-x1205: reset clock to sane state after power failure
When detecting power failure, the probe function would reset the clock
time to defined state.
However, the clock's _date_ might still be bogus and a subsequent probe
fails when sanity-checking these values.
Change the power-failure fixup code to do a full setting of rtc_time,
including a valid date.
Signed-off-by: Johannes Weiner <jw@emlix.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Paul Gortmaker <p_gortmaker@yahoo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Johannes Weiner [Tue, 1 Dec 2009 21:17:48 +0000 (13:17 -0800)]
rtc-x1205: fix rtc_time to y2k register value conversion
The possible CCR_Y2K register values are 19 or 20 and struct rtc_time's
tm_year is in years since 1900.
The function translating rtc_time to register values assumes tm_year to be
years since first christmas, though, and we end up storing 0 or 1 in the
CCR_Y2K register, which the hardware does not refuse to do.
A subsequent probing of the clock fails due to the invalid value range in
the register, though.
[ And if it didn't, reading the clock would yield a bogus year because
the function translating registers to tm_year is assuming a register
value of 19 or 20. ]
This fixes the conversion from years since 1900 in tm_year to the
corresponding CCR_Y2K value of 19 or 20.
Signed-off-by: Johannes Weiner <jw@emlix.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Paul Gortmaker <p_gortmaker@yahoo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Peter Horton [Tue, 1 Dec 2009 21:17:46 +0000 (13:17 -0800)]
aoe: prevent cache aliases
Prevent the AoE block driver from creating cache aliases of page cache
pages on machines with virtually indexed caches.
Building kernels on an AT91SAM9G20 board without this patch fails with
segmentation faults after a couple of passes.
Signed-off-by: Peter Horton <zero@colonel-panic.org>
Cc: "Ed L. Cashin" <ecashin@coraid.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Alek Du [Tue, 1 Dec 2009 21:17:45 +0000 (13:17 -0800)]
gpio: Langwell GPIO driver bugfixes
- Remove wrong and unnecessary unmask operation
- Remove extra GEDR reading
This fixes the loss of interrupts which occurs when two or more pins are
triggered in close succession.
Signed-off-by: Alek Du <alek.du@intel.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Sam Ravnborg [Tue, 1 Dec 2009 21:17:44 +0000 (13:17 -0800)]
kbuild: stepping down as maintainer
It has been fun but the last year or more it has been a duty and a burden.
So I leave it open for others to take over.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Anibal Monsalve Salazar <anibal@debian.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Sudhakar Rajashekhara [Tue, 1 Dec 2009 21:17:43 +0000 (13:17 -0800)]
davinci: fb: fix frame buffer driver issues
Following issues have been addressed on DA8XX/OMAP-L1XX:
a. Screen misalignment during booting when frame buffer console is
enabled.
b. Driver was configured always in PSEUDOCOLOR mode. This patch
dynamically configures the driver either in PSEUDOCOLOUR or TRUECOLOR
mode depending on bpp.
c. The RED and BLUE offsets were interchanged resulting in wrong
bootup logo colour.
This patch has been tested on DA830/OMAP-L137 and DA850/OMAP-L138 EVMs.
Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Cc: Steve Chen <schen@mvista.com>
Cc: Pavel Kiryukhin <pkiryukhin@ru.mvista.com>
Cc: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Dan Carpenter [Tue, 1 Dec 2009 21:17:41 +0000 (13:17 -0800)]
drivers/rtc/rtc-pcf50633.c: fix use after free in pcf50633_rtc_probe()
"rtc" is freed and then dereferenced on the next line. This patch fixes
that.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Cc: David Brownell <david-b@pacbell.net>
Cc: Paul Gortmaker <p_gortmaker@yahoo.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Andrew Morton [Tue, 1 Dec 2009 21:17:41 +0000 (13:17 -0800)]
drivers/media/dvb/dvb-core/dvb_frontend.c: needs semaphore.h
Fixes:
v4l/dvb_frontend.c: In function 'dvb_frontend_stop':
v4l/dvb_frontend.c:707: error: implicit declaration of function 'init_MUTEX'
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=14609
Reported-by: <tstrelar@gmail.com>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Tue, 1 Dec 2009 18:41:40 +0000 (10:41 -0800)]
Merge git://git./linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
Staging: update TODO files
Staging: hv: Fix some missing author names
Staging: hv: Fix vmbus event handler bug
Staging: hv: Fix argument order in incorrect memset invocations in hyperv driver.
Linus Torvalds [Tue, 1 Dec 2009 18:41:05 +0000 (10:41 -0800)]
Merge git://git./linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: Add support for Mobilcom Debitel USB UMTS Surf-Stick to option driver
USB: work around for EHCI with quirky periodic schedules
USB: musb: Fix CPPI IRQs not being signaled
USB: musb: respect usb_request->zero in control requests
USB: musb: fix ISOC Tx programming for CPPI DMAs
USB: musb: Remove unwanted message in boot log
usb: amd5536udc: fixed shared interrupt bug and warning oops
USB: ftdi_sio: Keep going when write errors are encountered.
USB: musb_gadget: fix STALL handling
USB: EHCI: don't send Clear-TT-Buffer following a STALL
Linus Torvalds [Tue, 1 Dec 2009 18:40:51 +0000 (10:40 -0800)]
Merge git://git./linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
tty/of_serial: add missing ns16550a id
bcm63xx_uart: Fix serial driver compile breakage.
tty_port: handle the nonblocking open of a dead port corner case
Linus Torvalds [Tue, 1 Dec 2009 16:26:44 +0000 (08:26 -0800)]
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: Loongson: Switch from flatmem to sparsemem
MIPS: Loongson: Disallow 4kB pages
MIPS: Add missing definition for MADV_HWPOISON.
MIPS: Fix build error if __xchg() is not getting inlined.
MIPS: IP22/IP28 Disable early printk to fix boot problems on some systems.
Wu Zhangjin [Tue, 1 Dec 2009 06:55:42 +0000 (14:55 +0800)]
MIPS: Loongson: Switch from flatmem to sparsemem
With flatmem hibernation for Loongson will fail, and there are also some
other problems such as broken files when using NFS or CIFS / Samba.
The config help of sparsemem says:
"This option provides some potential performance benefits, along with
decreased code complexity."
So to avoid the potential problems of FLATMEM, we disable FLATMEM directly
and use SPARSEMEM instead.
Related email thread:
http://groups.google.com/group/loongson-dev/browse_thread/thread/
b6b65890ec2b0f24/
feb43e5aa7f55d9b?show_docid=
feb43e5aa7f55d9b
Reported-by: Tatu Kilappa <tatu.kilappa@gmail.com>
Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
Patchwork: http://patchwork.linux-mips.org/patch/737/
Cc: linux-mips@linux-mips.org
Cc: zhangfx@lemote.com
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Wu Zhangjin [Tue, 1 Dec 2009 06:55:25 +0000 (14:55 +0800)]
MIPS: Loongson: Disallow 4kB pages
Currently, with PAGE_SIZE_4KB, the kernel for loongson will hang on:
Kernel panic - not syncing: Attempted to kill init!
The possible reason is the cache aliases problem:
Loongson 2F has 64kb, 4 way L1 Cache, the way size is 16kb, which is bigger
then 4kb. so, If using 4kb page size, there is cache aliases problem.
To avoid this kind of problem, extra cache flushing. The 2nd possible
solution is 16kb page size which avoids cache aliases without the need for
extra cache flushes. So we disable 4kB pages until the aliasing issue is
solved.
Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
Patchwork: http://patchwork.linux-mips.org/patch/736/
Cc: linux-mips@linux-mips.org
Cc: zhangfx@lemote.com
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Thu, 26 Nov 2009 18:28:42 +0000 (18:28 +0000)]
MIPS: Add missing definition for MADV_HWPOISON.
Thanks to Joseph S. Myers for reporting this.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Cc: "Joseph S. Myers" <joseph@codesourcery.com>
Patchwork: http://patchwork.linux-mips.org/patch/723/
Ralf Baechle [Tue, 24 Nov 2009 13:16:02 +0000 (13:16 +0000)]
MIPS: Fix build error if __xchg() is not getting inlined.
If __xchg() is not getting inlined the outline version of the function
will have a reference to __xchg_called_with_bad_pointer() which does not
exist remaining. Fixed by using BUILD_BUG_ON() to check for allowable
operand sizes.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Patchwork: http://patchwork.linux-mips.org/patch/705/
Martin Michlmayr [Thu, 19 Nov 2009 16:40:09 +0000 (16:40 +0000)]
MIPS: IP22/IP28 Disable early printk to fix boot problems on some systems.
Some Debian users have reported that the kernel hangs early during boot on
some IP22 systems. Thomas Bogendoerfer found that this is due to a "bad
interaction between CONFIG_EARLY_PRINTK and overwritten prom memory during
early boot". Since there's no fix yet, disable CONFIG_EARLY_PRINTK for now.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Cc: linux-mips@linux-mips.org
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Dmitri Vorobiev <dmitri.vorobiev@gmail.com>
Patchwork: http://patchwork.linux-mips.org/patch/702/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
David Howells [Tue, 1 Dec 2009 15:36:11 +0000 (15:36 +0000)]
SLOW_WORK: Move slow_work's proc file to debugfs
Move slow_work's debugging proc file to debugfs.
Signed-off-by: David Howells <dhowells@redhat.com>
Requested-and-acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Tue, 1 Dec 2009 15:36:23 +0000 (07:36 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6:
alpha: Fixup last users of irq_chip->typename
Alpha: Rearrange thread info flags fixing two regressions
arch/alpha/kernel: Add kmalloc NULL tests
arch/alpha/kernel/sys_ruffian.c: Use DIV_ROUND_CLOSEST
Marc Dionne [Tue, 1 Dec 2009 14:09:24 +0000 (14:09 +0000)]
CacheFiles: Update IMA counters when using dentry_open
When IMA is active, using dentry_open without updating the
IMA counters will result in free/open imbalance errors when
fput is eventually called.
Signed-off-by: Marc Dionne <marc.c.dionne@gmail.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
David Howells [Tue, 1 Dec 2009 13:52:08 +0000 (13:52 +0000)]
SLOW_WORK: Fix the CONFIG_MODULES=n case
Commits 3d7a641 ("SLOW_WORK: Wait for outstanding work items belonging to a
module to clear") introduced some code to make sure that all of a module's
slow-work items were complete before that module was removed, and commit
3bde31a ("SLOW_WORK: Allow a requeueable work item to sleep till the thread is
needed") further extended that, breaking it in the process if CONFIG_MODULES=n:
CC kernel/slow-work.o
kernel/slow-work.c: In function 'slow_work_execute':
kernel/slow-work.c:313: error: 'slow_work_thread_processing' undeclared (first use in this function)
kernel/slow-work.c:313: error: (Each undeclared identifier is reported only once
kernel/slow-work.c:313: error: for each function it appears in.)
kernel/slow-work.c: In function 'slow_work_wait_for_items':
kernel/slow-work.c:950: error: 'slow_work_unreg_sync_lock' undeclared (first use in this function)
kernel/slow-work.c:951: error: 'slow_work_unreg_wq' undeclared (first use in this function)
kernel/slow-work.c:961: error: 'slow_work_unreg_work_item' undeclared (first use in this function)
kernel/slow-work.c:974: error: 'slow_work_unreg_module' undeclared (first use in this function)
kernel/slow-work.c:977: error: 'slow_work_thread_processing' undeclared (first use in this function)
make[1]: *** [kernel/slow-work.o] Error 1
Fix this by:
(1) Extracting the bits of slow_work_execute() that are contingent on
CONFIG_MODULES, and the bits that should be, into inline functions and
placing them into the #ifdef'd section that defines the relevant variables
and adding stubs for moduleless kernels. This allows the removal of some
#ifdefs.
(2) #ifdef'ing out the contents of slow_work_wait_for_items() in moduleless
kernels.
The four functions related to handling module unloading synchronisation (and
their associated variables) could be offloaded into a separate .c file, but
each function is only used once and three of them are tiny, so doing so would
prevent them from being inlined.
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
David Howells [Tue, 1 Dec 2009 13:38:45 +0000 (13:38 +0000)]
9p: fix build breakage introduced by FS-Cache
While building 2.6.32-rc8-git2 for Fedora I noticed the following thinko
in commit
201a15428bd54f83eccec8b7c64a04b8f9431204 ("FS-Cache: Handle
pages pending storage that get evicted under OOM conditions"):
fs/9p/cache.c: In function '__v9fs_fscache_release_page':
fs/9p/cache.c:346: error: 'vnode' undeclared (first use in this function)
fs/9p/cache.c:346: error: (Each undeclared identifier is reported only once
fs/9p/cache.c:346: error: for each function it appears in.)
make[2]: *** [fs/9p/cache.o] Error 1
Fix the 9P filesystem to correctly construct the argument to
fscache_maybe_release_page().
Signed-off-by: Kyle McMartin <kyle@redhat.com>
Signed-off-by: Xiaotian Feng <dfeng@redhat.com> [from identical patch]
Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> [from identical patch]
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Mark Brown [Mon, 30 Nov 2009 13:24:18 +0000 (13:24 +0000)]
mfd: Correct WM831X_MAX_ISEL_VALUE
There was confusion between the array size and the highest ISEL
value possible.
Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
NeilBrown [Tue, 1 Dec 2009 06:30:59 +0000 (17:30 +1100)]
md: revert incorrect fix for read error handling in raid1.
commit
4706b349f was a forward port of a fix that was needed
for SLES10. But in fact it is not needed in mainline because
the earlier commit
dd00a99e7a fixes the same problem in a
better way.
Further, this commit introduces a bug in the way it interacts with
the automatic read-error-correction. If, after a read error is
successfully corrected, the same disk is chosen to re-read - the
re-read won't be attempted but an error will be returned instead.
After reverting that commit, there is the possibility that a
read error on a read-only array (where read errors cannot
be corrected as that requires a write) will repeatedly read the same
device and continue to get an error.
So in the "Array is readonly" case, fail the drive immediately on
a read error.
Signed-off-by: NeilBrown <neilb@suse.de>
Cc: stable@kernel.org
Thomas Gleixner [Tue, 1 Dec 2009 03:51:31 +0000 (22:51 -0500)]
alpha: Fixup last users of irq_chip->typename
The typename member of struct irq_chip was kept for migration purposes
and is obsolete since more than 2 years. Fix up the leftovers.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Richard Henderson <rth@twiddle.net>
Cc: linux-alpha@vger.kernel.org
Signed-off-by: Matt Turner <mattst88@gmail.com>
Michael Cree [Tue, 1 Dec 2009 03:44:40 +0000 (22:44 -0500)]
Alpha: Rearrange thread info flags fixing two regressions
The removal of the TIF_NOTIFY_RESUME flag, commit
a583f1b54249b
"remove unused TIF_NOTIFY_RESUME flag," resulted in incorrect
setting of the unaligned access control flags by the prctl syscall.
The re-addition of the TIF_NOTIFY_RESUME flag, commit
d0420c83f39f
"KEYS: Extend TIF_NOTIFY_RESUME to (almost) all architectures [try #6]"
further caused problems, namely incorrect operands to assembler code
as evidenced by:
AS arch/alpha/kernel/entry.o
arch/alpha/kernel/entry.S: Assembler messages:
arch/alpha/kernel/entry.S:326: Warning: operand out of range
(0x0000000000000406 is not between 0x0000000000000000 and
0x00000000000000ff)
Both regressions fixed by (1) rearranging TIF_NOTIFY_RESUME flag to be
in lower 8 bits of the thread info flags, and (2) making sure that
ALPHA_UAC_SHIFT matches the rearrangement of the thread info flags.
Signed-off-by: Michael Cree <mcree@orcon.net.nz>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: David Howells <dhowells@redhat.com>,
Signed-off-by: Matt Turner <mattst88@gmail.com>
Linus Torvalds [Tue, 1 Dec 2009 00:47:16 +0000 (16:47 -0800)]
Merge branch 'security' of git://git./linux/kernel/git/linville/wireless-2.6
* 'security' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6:
mac80211: fix spurious delBA handling
mac80211: fix two remote exploits
Gernot Hillier [Fri, 27 Nov 2009 12:49:23 +0000 (13:49 +0100)]
USB: Add support for Mobilcom Debitel USB UMTS Surf-Stick to option driver
This patch adds the vendor and device id for the Mobilcom Debitel UMTS surf
stick (a.k.a. 4G Systems XSStick W14, MobiData MBD-200HU, ...).
To see these ids, you need to switch the stick to modem operation first
with the help of usb_modeswitch. This makes it switch from 1c9e:f000 to
1c9e:9603 and thus be recognized by the option driver.
Signed-off-by: Gernot Hillier <gernot@hillier.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Oliver Neukum [Fri, 27 Nov 2009 14:17:59 +0000 (15:17 +0100)]
USB: work around for EHCI with quirky periodic schedules
a quirky chipset needs periodic schedules to run for a minimum
time before they can be disabled again. This enforces the requirement
with a time stamp and a calculated delay
Signed-off-by: Oliver Neukum <oliver@neukum.org>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Daniel Glöckner [Tue, 17 Nov 2009 09:52:57 +0000 (15:22 +0530)]
USB: musb: Fix CPPI IRQs not being signaled
On tx channel abort a cppi interrupt is generated for a short time by
setting the lowest bit of the TCPPICOMPPTR register. It is then reset
immediately by clearing the bit. When the interrupt handler is run,
it does not detect an interrupt in the TCPPIMSKSR or RCPPIMSKSR
registers and thus exits early without writing the TCPPIEOIR register.
It appears that this inhibits further cppi interrupts until the handler
is called by chance, f.ex. from davinci_interrupt().
By moving the unmasking of the interrupt below the writes to
TCPPICOMPPTR, no interrupt is generated and no write to TCPPIEOIR is
necessary.
Signed-off-by: Daniel Glöckner <dg@emlix.com>
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Daniel Glöckner [Tue, 17 Nov 2009 09:52:56 +0000 (15:22 +0530)]
USB: musb: respect usb_request->zero in control requests
In gadget mode the answer to a control request should be followed by
a zero-length packet if the amount transferred is an exact multiple of
the endpoint's packet size and the requests has its "zero" flag set.
This patch prevents the request from being immediately removed from the
queue when a control IN transfer ends on a full packet and "zero" is set.
The next time ep0_txstate is entered, a zero-length packet is queued and
the request is removed as fifo_count is 0.
Signed-off-by: Daniel Glöckner <dg@emlix.com>
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ajay Kumar Gupta [Tue, 17 Nov 2009 09:52:55 +0000 (15:22 +0530)]
USB: musb: fix ISOC Tx programming for CPPI DMAs
Isochronous Tx DMA is getting programmed but never getting started
for CPPI and TUSB DMAs and thus Isochronous Tx doesn't work.
Fixing it by starting DMAs using musb_h_tx_dma_start().
Signed-off-by: Swaminathan S <swami.iyer@ti.com>
Signed-off-by: Babu Ravi <ravibabu@ti.com>
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ajay Kumar Gupta [Tue, 17 Nov 2009 09:52:54 +0000 (15:22 +0530)]
USB: musb: Remove unwanted message in boot log
Removes below unnecessary log of almost 28 lines during boot.
musb_hdrc: hw_ep 0shared, max 64
musb_hdrc: hw_ep 1tx, max 512
musb_hdrc: hw_ep 1rx, max 512
...
...
musb_hdrc: hw_ep 13shared, max 4096
musb_hdrc: hw_ep 14shared, max 1024
musb_hdrc: hw_ep 15shared, max 1024
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Thomas Dahlmann [Tue, 17 Nov 2009 22:18:27 +0000 (14:18 -0800)]
usb: amd5536udc: fixed shared interrupt bug and warning oops
- fixed shared interrupt bug reported by Vadim Lobanov
- fixed possible warning oops on driver unload when connected
- prevent interrupt flood in PIO mode ("modprobe amd5536udc use_dma=0")
when using gadget ether
Signed-off-by: Thomas Dahlmann <dahlmann.thomas@arcor.de>
Cc: Robert Richter <robert.richter@amd.com>
Cc: David Brownell <david-b@pacbell.net>
Cc: stable <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Eric W. Biederman [Wed, 18 Nov 2009 03:10:48 +0000 (19:10 -0800)]
USB: ftdi_sio: Keep going when write errors are encountered.
The use of urb->actual_length to update tx_outstanding_bytes
implicitly assumes that the number of bytes actually written is the
same as the number of bytes we tried to write. On error that
assumption is violated so just use transfer_buffer_length the number
of bytes we intended to write to the device.
If an error occurs we need to fall through and call
usb_serial_port_softint to wake up processes waiting in
tty_wait_until_sent.
Signed-off-by: Eric W. Biederman <ebiederm@aristanetworks.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sergei Shtylyov [Wed, 18 Nov 2009 19:51:18 +0000 (22:51 +0300)]
USB: musb_gadget: fix STALL handling
The driver incorrectly cancels the mass-storage device CSW request
(which leads to device reset) due to giving back URB at the head of
endpoint's queue after sending each STALL handshake; stop doing that
and start checking for the queue being non-empty before stalling an
endpoint and disallowing stall in such case in musb_gadget_set_halt()
like the other gadget drivers do.
Moreover, the driver starts Rx request despite of the endpoint being
halted -- fix this by moving the SendStall bit check from musb_g_rx()
to rxstate(). And we also sometimes get into rxstate() with DMA still
active after clearing an endpoint's halt (not clear why), so bail out
in this case, similarly to what txstate() does...
While at it, also do the following changes :
- in musb_gadget_set_halt(), remove pointless Tx FIFO flushing (the
driver does not allow stalling with non-empty Tx FIFO anyway);
- in rxstate(), stop pointlessly zeroing the 'csr' variable;
- in musb_gadget_set_halt(), move the 'done' label to a more proper
place;
- in musb_g_rx(), eliminate the 'done' label completely...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Stern [Wed, 18 Nov 2009 16:37:15 +0000 (11:37 -0500)]
USB: EHCI: don't send Clear-TT-Buffer following a STALL
This patch (as1304) fixes a regression in ehci-hcd. Evidently some
hubs don't handle Clear-TT-Buffer requests correctly, so we should
avoid sending them when they don't appear to be absolutely necessary.
The reported symptom is that output on a downstream audio device cuts
out because the hub stops relaying isochronous packets.
The patch prevents Clear-TT-Buffer requests from being sent following
a STALL handshake. In theory a STALL indicates either that the
downstream device sent a STALL or that no matching TT buffer could be
found. In either case, the transfer is completed and the TT buffer
does not remain busy, so it doesn't need to be cleared.
Also, the patch fixes a minor flaw in the code that actually sends the
Clear-TT-Buffer requests. Although the pipe direction isn't really
used for control transfers, it should be a Send rather than a Receive.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Reported-by: Javier Kohen <jkohen@users.sourceforge.net>
CC: David Brownell <david-b@pacbell.net>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Bartlomiej Zolnierkiewicz [Wed, 21 Oct 2009 12:42:11 +0000 (14:42 +0200)]
Staging: update TODO files
Remove my mail address.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Mon, 23 Nov 2009 17:00:22 +0000 (17:00 +0000)]
Staging: hv: Fix some missing author names
Fix some missing author names.
They were accidentally removed by someone within Microsoft before the
files were sent for inclusion in the kernel.
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Haiyang Zhang [Fri, 20 Nov 2009 16:29:17 +0000 (16:29 +0000)]
Staging: hv: Fix vmbus event handler bug
The flag ENABLE_POLLING is always enabled in original Makefile, but
accidently removed during porting to mainline kernel. The patch fixes
this bug which can cause stalled network communication. Credit needs to
go to Eric Sesterhenn <eric.sesterhenn@lsexperts.de> For pointing out a
typo in the original code as well.
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Dave Jones [Wed, 11 Nov 2009 21:57:03 +0000 (16:57 -0500)]
Staging: hv: Fix argument order in incorrect memset invocations in hyperv driver.
Nearly every invocation of memset in drivers/staging/hv/StorVsc.c has
its arguments the wrong way around.
Signed-off-by: Dave Jones <davej@redhat.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Michal Simek [Tue, 24 Nov 2009 10:22:41 +0000 (10:22 +0000)]
tty/of_serial: add missing ns16550a id
Many boards have a bug-free ns16550 compatible serial port, which we should
register as PORT_16550A. This introduces a new value "ns16550a" for the
compatible property of of_serial to let a firmware choose that model instead
of using the crippled PORT_16550 mode.
Reported-by: Alon Ziv <alonz@nolaviz.org>
Signed-off-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Maxime Bizon [Sun, 15 Nov 2009 04:42:18 +0000 (05:42 +0100)]
bcm63xx_uart: Fix serial driver compile breakage.
The driver missed a small API change while sitting in Ralf's tree, this
patch makes it compile again.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox [Wed, 18 Nov 2009 14:12:58 +0000 (14:12 +0000)]
tty_port: handle the nonblocking open of a dead port corner case
Some drivers allow O_NDELAY of a dead port (eg for setserial to work). In that
situation we must not try to raise the carrier.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Linus Torvalds [Mon, 30 Nov 2009 23:21:50 +0000 (15:21 -0800)]
Merge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] fix crash when disconnecting usb storage
[SCSI] fix async scan add/remove race resulting in an oops
[SCSI] sd: Return correct error code for DIF
Linus Torvalds [Mon, 30 Nov 2009 23:17:24 +0000 (15:17 -0800)]
Merge git://git./linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: gcm - fix another complete call in complete fuction
crypto: padlock-aes - Use the correct mask when checking whether copying is required
Linus Torvalds [Mon, 30 Nov 2009 22:51:29 +0000 (14:51 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
Blackfin: fix SMP build error in start_thread()
Blackfin: fix memset in smp_send_reschedule() and -stop()
Blackfin: fix typo in ptrace poking
Blackfin: check for anomaly
05000475
Blackfin: work around testset anomaly
05000477
Blackfin: update anomaly lists
Blackfin: fix cache Kconfig typo
Blackfin: fix suspend/resume failure with some on-chip ROMs
Linus Torvalds [Mon, 30 Nov 2009 22:51:01 +0000 (14:51 -0800)]
Merge git://git./linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] Fix sparse warning
[CIFS] Duplicate data on appending to some Samba servers
[CIFS] fix oops in cifs_lookup during net boot
Linus Torvalds [Mon, 30 Nov 2009 22:50:44 +0000 (14:50 -0800)]
Merge branch 'i2c-for-linus' of git://git./linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
at24: Use timeout also for read
i2c: Fix userspace_device list corruption
MAINTAINERS: Add missing i2c files
i2c/tsl2550: Fix lux value in extended mode
Linus Torvalds [Mon, 30 Nov 2009 22:50:01 +0000 (14:50 -0800)]
Merge branch 'for-linus' of /home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Update mach-types
ARM: 5793/1: ARM: Check put_user fail in do_signal when enable OABI_COMPAT
MAINTAINERS: add maintainer information for AMBA primecell drivers
[ARM] pxa/spitz: fix compile regression on spitz
ARM: PNX4008: i2c-pnx: use the same dev_id for request_irq and free_irq
[ARM] pxa/cpufreq: fix index assignments for end marker
ARM: PNX4008: fix watchdog device driver name
[ARM] kmap: fix build errors with DEBUG_HIGHMEM enabled
Linus Torvalds [Mon, 30 Nov 2009 22:49:39 +0000 (14:49 -0800)]
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Fix DEBUG_HIGHMEM build break from
d4515646699
Becky Bruce [Mon, 23 Nov 2009 12:28:53 +0000 (12:28 +0000)]
powerpc: Fix DEBUG_HIGHMEM build break from
d4515646699
Code was added to mm/higmem.c that depends on several
kmap types that powerpc does not support. We add dummy
invalid definitions for KM_NMI, KM_NM_PTE, and KM_IRQ_PTE.
According to list discussion, this fix should not be needed
anymore starting with 2.6.33. The code is commented to this
effect so hopefully we will remember to remove this.
Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Linus Torvalds [Mon, 30 Nov 2009 22:02:34 +0000 (14:02 -0800)]
Merge git://git./linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
ide: fix ioctl to pass requested transfer mode to ide_find_dma_mode instead of UDMA6
Linus Torvalds [Mon, 30 Nov 2009 22:02:23 +0000 (14:02 -0800)]
Merge git://git./linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sunsu: Use sunserial_console_termios() in sunsu_console_setup().
sunsu: Pass true 'ignore_line' to console match when RSC or LOM console.
serial: suncore: Fix RSC/LOM handling in sunserial_console_termios().
serial: suncore: Add 'ignore_line' argument to sunserial_console_match().
sunsu: Fix detection of SU ports which are RSC console or control.
sunsab: Do not set sunsab_reg.cons right before registering minors.
sparc64: Fix definition of VMEMMAP_SIZE.
Linus Torvalds [Mon, 30 Nov 2009 22:01:36 +0000 (14:01 -0800)]
Merge git://git./linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
b44: Fix wedge when using netconsole.
wan: cosa: drop chan->wsem on error path
ep93xx-eth: check for zero MAC address on probe, not on device open
NET: smc91x: Fix irq flags
smsc9420: prevent BUG() if ethtool is called with interface down
r8169: restore mac addr in rtl8169_remove_one and rtl_shutdown
ipv4: additional update of dev_net(dev) to struct *net in ip_fragment.c, NULL ptr OOPS
e100: Use pci pool to work around GFP_ATOMIC order 5 memory allocation failure
sctp: on T3_RTX retransmit all the in-flight chunks
pktgen: Fix netdevice unregister
macvlan: fix gso_max_size setting
rfkill: fix miscdev ops
ath9k: set ps_default as false
hso: fix soft-lockup
hso: fix debug routines
pktgen: Fix device name compares
stmmac: do not fail when the timer cannot be used.
stmmac: fixed a compilation error when use the external timer
netfilter: xt_limit: fix invalid return code in limit_mt_check()
Au1x00: fix crash when trying register_netdev()
...
Linus Torvalds [Mon, 30 Nov 2009 22:00:09 +0000 (14:00 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/mszeredi/fuse
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
fuse: reject O_DIRECT flag also in fuse_create
Linus Torvalds [Mon, 30 Nov 2009 21:59:51 +0000 (13:59 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: keyboard - fix braille keyboard keysym generation
Linus Torvalds [Mon, 30 Nov 2009 21:58:50 +0000 (13:58 -0800)]
Merge branch 'pm-fixes' of git://git./linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM: fix irq enable/disable in runtime PM code
Linus Torvalds [Mon, 30 Nov 2009 21:58:23 +0000 (13:58 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: ohci: pass correct iso xmit timestamps to core
firewire: ohci: Make cycleMatch ISO transmission work
Linus Torvalds [Mon, 30 Nov 2009 21:58:01 +0000 (13:58 -0800)]
Merge branch 'for_linus' of git://git./linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
V4L/DVB (13372): staging/go7007: fix mutex function usage for s2250
staging/go7007: Fix compilation by re-adding the missing s2250-loader.h
V4L/DVB (13530): Fix wrong parameter order in memset
V4L/DVB (13481): sh_mobile_ceu_camera: fix compile warning
V4L/DVB (13436): cxusb: Fix hang on DViCO FusionHDTV DVB-T Dual Digital 4 (rev 1)
V4L/DVB (13412): SMS_SIANO_MDTV should depend on HAS_DMA
V4L/DVB (13372a): MAINTAINERS: addition of gspca_gl860 driver
V4L/DVB (13371): davinci: remove stray duplicate config pointer
V4L/DVB (13366): em28xx: fix Reddo DVB-C USB TV Box GPIO
V4L/DVB (13345): soc-camera: sh_mobile_ceu_camera: call pm_runtime_disable
V4L/DVB (13344): soc-camera: properly initialise the device object when reusing
V4L/DVB (13343): v4l: add more missing linux/sched.h includes
V4L/DVB (13321): radio-gemtek-pci: fix double mutex_lock
Linus Torvalds [Mon, 30 Nov 2009 21:57:19 +0000 (13:57 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/anholt/drm-intel
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
drm/i915: Select CONFIG_SHMEM
drm/i915: Fix CRT hotplug detect by checking really no channels attached
agp/intel: new host bridge support
drm/i915: Add more registers save/restore for Ironlake suspend
drm/i915: Fix IRQ stall issue on Ironlake
drm/i915: HDMI hardware workaround for Ironlake
drm/i915: Fix and cleanup DPLL calculation for Ironlake
drm/i915: Avoid potential sleep whilst holding spinlock
Linus Torvalds [Mon, 30 Nov 2009 21:57:03 +0000 (13:57 -0800)]
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cciss: make device attrs static
Thaw refrigerated bdi flusher threads before invoking kthread_stop on them
Linus Torvalds [Mon, 30 Nov 2009 21:56:21 +0000 (13:56 -0800)]
Merge branch 'release' of git://git./linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
acerhdf: return temperature in milidegree instead of degree
thinkpad-acpi: fix detection of old ThinkPads
thinkpad-acpi: fix sign of ERESTARTSYS return
ACPI: Add Thinkpad T400, T500 to OSI(Linux) white-list
ACPICA: Silence the warning about _BIF returning the buffer
ACPI: DMI init_set_sci_en_on_resume for HP-Compaq C700
Linus Torvalds [Mon, 30 Nov 2009 21:55:48 +0000 (13:55 -0800)]
Merge branch 'fixes' of git://git./linux/kernel/git/davej/cpufreq
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] Enable ACPI PDC handshake for VIA/Centaur CPUs
Linus Torvalds [Mon, 30 Nov 2009 21:55:20 +0000 (13:55 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: AACI: fix recording bug
ALSA: AACI: fix AC97 multiple-open bug
ASoC: AIC23: Fixing infinite loop in resume path
ASoC: Fix suspend with active audio streams
Linus Torvalds [Mon, 30 Nov 2009 21:54:10 +0000 (13:54 -0800)]
Merge branch 'drm-linus' of git://git./linux/kernel/git/airlied/drm-2.6
* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/fb: fix FBIOGET/PUT_VSCREENINFO pixel clock handling
drm: make sure page protections are updated after changing vm_flags
drm/radeon/kms: Report vga connector is connected according to ddc_probe
drm: mm always protect change to unused_nodes with unused_lock spinlock
drm/radeon/kms: Disable TV load detect on RS400,RC410,RS480
drm/radeon/kms: read back register before writing in IIO.
drm/radeon/kms: fix handling of d1/d2 vga
drm: work around EDIDs with bad htotal/vtotal values
drm/radeon/kms: resume AGP by calling init.
Linus Torvalds [Mon, 30 Nov 2009 21:53:53 +0000 (13:53 -0800)]
Merge branch 'fixes' of git://git./linux/kernel/git/djbw/async_tx
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
shdma: fix initialization error handling
ioat3: fix pq completion versus channel deallocation race
async_tx: build-time toggling of async_{syndrome,xor}_val dma support
dmaengine: include xor/pq validate in device_has_all_tx_types()
ioat2,3: report all uncorrectable errors
ioat3: specify valid address for disabled-Q or disabled-P
ioat2,3: disable asynchronous error notifications
ioat3: dca and raid operations are incompatible
ioat: silence "dca disabled" messages