Merge branch 'reiserfs/kill-bkl' of...

Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/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

parents 76212a84 175359f8

fs/reiserfs/inode.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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);