Skip to content

Commit

Permalink
Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linu…
Browse files Browse the repository at this point in the history
…x/kernel/git/frederic/random-tracing

* 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
  reiserfs: Fix softlockup while waiting on an inode
  • Loading branch information
Linus Torvalds committed Feb 16, 2010
2 parents 76212a8 + 175359f commit 0aa2ca9
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions fs/reiserfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 0aa2ca9

Please sign in to comment.