Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45d28b09 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: 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
parents 4207a152 835d5247

fs/reiserfs/bitmap.c

+3 −0
Original line number Diff line number Diff line
@@ -1277,7 +1277,10 @@ int reiserfs_init_bitmap_cache(struct super_block *sb) 
	struct reiserfs_bitmap_info *bitmap;

	unsigned int bmap_nr = reiserfs_bmap_count(sb);



	/* Avoid lock recursion in fault case */

	reiserfs_write_unlock(sb);

	bitmap = vmalloc(sizeof(*bitmap) * bmap_nr);

	reiserfs_write_lock(sb);

	if (bitmap == NULL)

		return -ENOMEM;

fs/reiserfs/inode.c

+3 −2
Original line number Diff line number Diff line
@@ -31,11 +31,12 @@ void reiserfs_delete_inode(struct inode *inode) 
	    JOURNAL_PER_BALANCE_CNT * 2 +

	    2 * REISERFS_QUOTA_INIT_BLOCKS(inode->i_sb);

	struct reiserfs_transaction_handle th;

	int depth;

	int err;



	truncate_inode_pages(&inode->i_data, 0);



	reiserfs_write_lock(inode->i_sb);

	depth = reiserfs_write_lock_once(inode->i_sb);



	/* The = 0 happens when we abort creating a new inode for some reason like lack of space.. */

	if (!(inode->i_state & I_NEW) && INODE_PKEY(inode)->k_objectid != 0) {	/* also handles bad_inode case */
@@ -74,7 +75,7 @@ void reiserfs_delete_inode(struct inode *inode) 
      out:

	clear_inode(inode);	/* note this must go after the journal_end to prevent deadlock */

	inode->i_blocks = 0;

	reiserfs_write_unlock(inode->i_sb);

	reiserfs_write_unlock_once(inode->i_sb, depth);

}



static void _make_cpu_key(struct cpu_key *key, int version, __u32 dirid,

fs/reiserfs/journal.c

+14 −4
Original line number Diff line number Diff line
@@ -2009,10 +2009,11 @@ static int do_journal_release(struct reiserfs_transaction_handle *th, 
		destroy_workqueue(commit_wq);

		commit_wq = NULL;

	}

	reiserfs_write_lock(sb);



	free_journal_ram(sb);



	reiserfs_write_lock(sb);



	return 0;

}
@@ -2758,11 +2759,18 @@ int journal_init(struct super_block *sb, const char *j_dev_name, 
	struct reiserfs_journal *journal;

	struct reiserfs_journal_list *jl;

	char b[BDEVNAME_SIZE];

	int ret;



	/*

	 * Unlock here to avoid various RECLAIM-FS-ON <-> IN-RECLAIM-FS

	 * dependency inversion warnings.

	 */

	reiserfs_write_unlock(sb);

	journal = SB_JOURNAL(sb) = vmalloc(sizeof(struct reiserfs_journal));

	if (!journal) {

		reiserfs_warning(sb, "journal-1256",

				 "unable to get memory for journal structure");

		reiserfs_write_lock(sb);

		return 1;

	}

	memset(journal, 0, sizeof(struct reiserfs_journal));
@@ -2771,10 +2779,12 @@ int journal_init(struct super_block *sb, const char *j_dev_name, 
	INIT_LIST_HEAD(&journal->j_working_list);

	INIT_LIST_HEAD(&journal->j_journal_list);

	journal->j_persistent_trans = 0;

	if (reiserfs_allocate_list_bitmaps(sb,

					   journal->j_list_bitmap,

					   reiserfs_bmap_count(sb)))

	ret = reiserfs_allocate_list_bitmaps(sb, journal->j_list_bitmap,

					   reiserfs_bmap_count(sb));

	reiserfs_write_lock(sb);

	if (ret)

		goto free_and_return;



	allocate_bitmap_nodes(sb);



	/* reserved for journal area support */

fs/reiserfs/lock.c

+9 −0
Original line number Diff line number Diff line
@@ -86,3 +86,12 @@ void reiserfs_check_lock_depth(struct super_block *sb, char *caller) 
		reiserfs_panic(sb, "%s called without kernel lock held %d",

			       caller);

}



#ifdef CONFIG_REISERFS_CHECK

void reiserfs_lock_check_recursive(struct super_block *sb)

{

	struct reiserfs_sb_info *sb_i = REISERFS_SB(sb);



	WARN_ONCE((sb_i->lock_depth > 0), "Unwanted recursive reiserfs lock!\n");

}

#endif

fs/reiserfs/namei.c

+4 −3
Original line number Diff line number Diff line
@@ -921,6 +921,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry) 
	struct reiserfs_transaction_handle th;

	int jbegin_count;

	unsigned long savelink;

	int depth;



	inode = dentry->d_inode;
@@ -932,7 +933,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry) 
	    JOURNAL_PER_BALANCE_CNT * 2 + 2 +

	    4 * REISERFS_QUOTA_TRANS_BLOCKS(dir->i_sb);



	reiserfs_write_lock(dir->i_sb);

	depth = reiserfs_write_lock_once(dir->i_sb);

	retval = journal_begin(&th, dir->i_sb, jbegin_count);

	if (retval)

		goto out_unlink;
@@ -993,7 +994,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry) 


	retval = journal_end(&th, dir->i_sb, jbegin_count);

	reiserfs_check_path(&path);

	reiserfs_write_unlock(dir->i_sb);

	reiserfs_write_unlock_once(dir->i_sb, depth);

	return retval;



      end_unlink:
@@ -1003,7 +1004,7 @@ static int reiserfs_unlink(struct inode *dir, struct dentry *dentry) 
	if (err)

		retval = err;

      out_unlink:

	reiserfs_write_unlock(dir->i_sb);

	reiserfs_write_unlock_once(dir->i_sb, depth);

	return retval;

}