From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Jun 2014 17:45:14 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Tag: firefly_0821_release~176^2~3782
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=2840c566e95599cd60c7143762ca8b49d9395050;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for_linus' of git://git./linux/kernel/git/jack/linux-fs

Pull reiserfs and ext3 changes from Jan Kara:
 "Big reiserfs cleanup from Jeff, an ext3 deadlock fix, and some small
  cleanups"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: (34 commits)
  reiserfs: Fix compilation breakage with CONFIG_REISERFS_CHECK
  ext3: Fix deadlock in data=journal mode when fs is frozen
  reiserfs: call truncate_setsize under tailpack mutex
  fs/jbd/revoke.c: replace shift loop by ilog2
  reiserfs: remove obsolete __constant_cpu_to_le32
  reiserfs: balance_leaf refactor, split up balance_leaf_when_delete
  reiserfs: balance_leaf refactor, format balance_leaf_finish_node
  reiserfs: balance_leaf refactor, format balance_leaf_new_nodes_paste
  reiserfs: balance_leaf refactor, format balance_leaf_paste_right
  reiserfs: balance_leaf refactor, format balance_leaf_insert_right
  reiserfs: balance_leaf refactor, format balance_leaf_paste_left
  reiserfs: balance_leaf refactor, format balance_leaf_insert_left
  reiserfs: balance_leaf refactor, pull out balance_leaf{left, right, new_nodes, finish_node}
  reiserfs: balance_leaf refactor, pull out balance_leaf_finish_node_paste
  reiserfs: balance_leaf refactor pull out balance_leaf_finish_node_insert
  reiserfs: balance_leaf refactor, pull out balance_leaf_new_nodes_paste
  reiserfs: balance_leaf refactor, pull out balance_leaf_new_nodes_insert
  reiserfs: balance_leaf refactor, pull out balance_leaf_paste_right
  reiserfs: balance_leaf refactor, pull out balance_leaf_insert_right
  reiserfs: balance_leaf refactor, pull out balance_leaf_paste_left
  ...
---

2840c566e95599cd60c7143762ca8b49d9395050
diff --cc fs/reiserfs/bitmap.c
index 1bcffeab713c,59f786dded49..dc198bc64c61
--- a/fs/reiserfs/bitmap.c
+++ b/fs/reiserfs/bitmap.c
@@@ -320,9 -356,12 +355,11 @@@ static int scan_bitmap(struct reiserfs_
  	unsigned int off_max = s->s_blocksize << 3;
  
  	BUG_ON(!th->t_trans_id);
 -
  	PROC_INFO_INC(s, scan_bitmap.call);
+ 
+ 	/* No point in looking for more free blocks */
  	if (SB_FREE_BLOCKS(s) <= 0)
- 		return 0;	// No point in looking for more free blocks
+ 		return 0;
  
  	get_bit_address(s, *start, &bm, &off);
  	get_bit_address(s, finish, &end_bm, &end_off);