Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 2840c566
    Linus Torvalds authored
    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
      ...
    2840c566