litmus-rt.git/fs, branch v2.6.33-rc3

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

2010-01-06T00:01:04+00:00

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  ocfs2: Handle O_DIRECT when writing to a refcounted cluster.

sysfs: Add lockdep annotations for the sysfs active reference

2010-01-04T20:34:46+00:00

Holding locks over device_del -> kobject_del -> sysfs_deactivate can
cause deadlocks if those same locks are grabbed in sysfs show or store
methods.

The I model s_active count + completion as a sleeping read/write lock.
I describe to lockdep sysfs_get_active as a read_trylock,
sysfs_put_active as a read_unlock, and sysfs_deactivate as a
write_lock and write_unlock pair.  This seems to capture the essence
for purposes of finding deadlocks, and in my testing gives finds real
issues and ignores non-issues.

This brings us back to holding locks over kobject_del is a problem
that ideally we should find a way of addressing, but at least lockdep
can tell us about the problems instead of requiring developers to debug
rare strange system deadlocks, that happen when sysfs files are removed
while being written to.

Signed-off-by: Eric W. Biederman 
Acked-by: Tejun Heo 
Signed-off-by: Linus Torvalds

Merge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

2010-01-04T20:32:09+00:00

* 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  binfmt_elf_fdpic: Fix build breakage introduced by coredump changes.
  sh: update defconfigs.
  sh: Don't default enable PMB support.
  sh: Disable PMB for SH4AL-DSP CPUs.
  sh: Only provide a PCLK definition for legacy CPG CPUs.

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2010-01-04T20:31:52+00:00

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: Calculate metadata requirements more accurately
  ext4: Fix accounting of reserved metadata blocks

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2

2010-01-04T20:28:26+00:00

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
  nilfs2: update mailing list address
  nilfs2: Storage class should be before const qualifier
  nilfs2: trivial coding style fix

binfmt_elf_fdpic: Fix build breakage introduced by coredump changes.

2010-01-04T06:42:14+00:00

Commit f6151dfea21496d43dbaba32cfcd9c9f404769bc introduces build
breakage, so this patch fixes it together with some printk formatting
cleanup.

Signed-off-by: Daisuke HATAYAMA 
Signed-off-by: Paul Mundt

Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing

2010-01-02T19:17:05+00:00

* 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
  reiserfs: Safely acquire i_mutex from xattr_rmdir
  reiserfs: Safely acquire i_mutex from reiserfs_for_each_xattr
  reiserfs: Fix journal mutex <-> inode mutex lock inversion
  reiserfs: Fix unwanted recursive reiserfs lock in reiserfs_unlink()
  reiserfs: Relax lock before open xattr dir in reiserfs_xattr_set_handle()
  reiserfs: Relax reiserfs lock while freeing the journal
  reiserfs: Fix reiserfs lock <-> i_mutex dependency inversion on xattr
  reiserfs: Warn on lock relax if taken recursively
  reiserfs: Fix reiserfs lock <-> i_xattr_sem dependency inversion
  reiserfs: Fix remaining in-reclaim-fs <-> reclaim-fs-on locking inversion
  reiserfs: Fix reiserfs lock <-> inode mutex dependency inversion
  reiserfs: Fix reiserfs lock and journal lock inversion dependency
  reiserfs: Fix possible recursive lock

writeback: add missing kernel-doc notation

2010-01-02T18:09:44+00:00

Fix the following htmldocs warning:

  Warning(fs/fs-writeback.c:255): No description found for parameter 'sb'

Signed-off-by: Jaswinder Singh Rajput 
Signed-off-by: Randy Dunlap 
Acked-by: Wu Fengguang 
Cc: Peter Zijlstra 
Cc: Jan Kara 
Cc: Jens Axboe 
Signed-off-by: Linus Torvalds

reiserfs: Safely acquire i_mutex from xattr_rmdir

2010-01-02T00:59:48+00:00

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 
Tested-by: Christian Kujau 
Cc: Alexander Beregalov 
Cc: Chris Mason 
Cc: Ingo Molnar

reiserfs: Safely acquire i_mutex from reiserfs_for_each_xattr

2010-01-02T00:59:14+00:00

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: [] reiserfs_for_each_xattr+0x23f/0x290

but task is already holding lock:
 (&REISERFS_SB(s)->lock){+.+.+.}, at: [] 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){+.+.+.}:
       [] __lock_acquire+0x11ff/0x19e0
       [] lock_acquire+0x68/0x90
       [] mutex_lock_nested+0x5b/0x340
       [] reiserfs_write_lock_once+0x29/0x50
       [] reiserfs_lookup+0x62/0x140
       [] __lookup_hash+0xef/0x110
       [] lookup_one_len+0x8d/0xc0
       [] open_xa_dir+0xea/0x1b0
       [] reiserfs_for_each_xattr+0x70/0x290
       [] reiserfs_delete_xattrs+0x1a/0x60
       [] reiserfs_delete_inode+0x9f/0x150
       [] generic_delete_inode+0xa2/0x170
       [] generic_drop_inode+0x4f/0x70
       [] iput+0x47/0x50
       [] do_unlinkat+0xd5/0x160
       [] sys_unlinkat+0x23/0x40
       [] sysenter_do_call+0x12/0x32

-> #0 (&sb->s_type->i_mutex_key#4/3){+.+.+.}:
       [] __lock_acquire+0x18f6/0x19e0
       [] lock_acquire+0x68/0x90
       [] mutex_lock_nested+0x5b/0x340
       [] reiserfs_for_each_xattr+0x23f/0x290
       [] reiserfs_delete_xattrs+0x1a/0x60
       [] reiserfs_delete_inode+0x9f/0x150
       [] generic_delete_inode+0xa2/0x170
       [] generic_drop_inode+0x4f/0x70
       [] iput+0x47/0x50
       [] do_unlinkat+0xd5/0x160
       [] sys_unlinkat+0x23/0x40
       [] 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: [] reiserfs_write_lock+0x29/0x40

stack backtrace:
Pid: 3242, comm: rm Not tainted 2.6.32-atom #179
Call Trace:
 [] ? printk+0x18/0x1a
 [] print_circular_bug+0xca/0xd0
 [] __lock_acquire+0x18f6/0x19e0
 [] ? mark_held_locks+0x62/0x80
 [] ? trace_hardirqs_on+0xb/0x10
 [] ? mutex_unlock+0x8/0x10
 [] lock_acquire+0x68/0x90
 [] ? reiserfs_for_each_xattr+0x23f/0x290
 [] ? reiserfs_for_each_xattr+0x23f/0x290
 [] mutex_lock_nested+0x5b/0x340
 [] ? reiserfs_for_each_xattr+0x23f/0x290
 [] reiserfs_for_each_xattr+0x23f/0x290
 [] ? delete_one_xattr+0x0/0x100
 [] reiserfs_delete_xattrs+0x1a/0x60
 [] ? reiserfs_write_lock_once+0x29/0x50
 [] reiserfs_delete_inode+0x9f/0x150
 [] ? _atomic_dec_and_lock+0x4f/0x70
 [] ? reiserfs_delete_inode+0x0/0x150
 [] generic_delete_inode+0xa2/0x170
 [] generic_drop_inode+0x4f/0x70
 [] iput+0x47/0x50
 [] do_unlinkat+0xd5/0x160
 [] ? mutex_unlock+0x8/0x10
 [] ? vfs_readdir+0x7d/0xb0
 [] ? filldir64+0x0/0xf0
 [] ? sysenter_exit+0xf/0x16
 [] ? trace_hardirqs_on_caller+0x124/0x170
 [] sys_unlinkat+0x23/0x40
 [] sysenter_do_call+0x12/0x32

Signed-off-by: Frederic Weisbecker 
Tested-by: Christian Kujau 
Cc: Alexander Beregalov 
Cc: Chris Mason 
Cc: Ingo Molnar