reiserfs fixes
Linus,
Please pull the reiserfs/kill-bkl branch that can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
reiserfs/kill-bkl
Thanks,
Frederic
---
Frederic Weisbecker (1):
reiserfs: Fix softlockup while waiting on an inode
fs/reiserfs/inode.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
---
commit 175359f89df39f4faed663c8cfd6ee0222d2fa1e
Author: Frederic Weisbecker <[email protected]> Date: Thu Feb 11 13:13:10 2010 +0100
reiserfs: Fix softlockup while waiting on an inode
When we wait for an inode through reiserfs_iget(), we hold the reiserfs lock. And waiting for an inode may imply waiting for its writeback. But the inode writeback path may also require the reiserfs lock, which leads to a deadlock.
We just need to release the reiserfs lock from reiserfs_iget() to fix this.
Reported-by Alexander Beregalov <[email protected]>
Signed-off-by Frederic Weisbecker <[email protected]>
Tested-by Christian Kujau <[email protected]>
Cc Chris Mason <[email protected]>
fs/reiserfs/inode.c +2 -0
@@ -1497,9 +1497,11 @@ struct inode *reiserfs_iget(struct super_block *s, const struct cpu_key *key) args.objectid = key->on_disk_key.k_objectid; args.dirid = key->on_disk_key.k_dir_id; +reiserfs_write_unlock (s); inode =iget5_locked (s, key->on_disk_key.k_objectid, reiserfs_find_actor, reiserfs_init_locked_inode, (void *)(&args)); +reiserfs_write_lock (s);if (!inode)return ERR_PTR (-ENOMEM );