Skip to content
  • Linus Torvalds's avatar
    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 · acd15a83
    Linus Torvalds authored
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (56 commits)
      ocfs2: Make cached block reads the common case.
      ocfs2: Kill the last naked wait_on_buffer() for cached reads.
      ocfs2: Move ocfs2_bread() into dir.c
      ocfs2: Simplify ocfs2_read_block()
      ocfs2: Require an inode for ocfs2_read_block(s)().
      ocfs2: Separate out sync reads from ocfs2_read_blocks()
      ocfs2: Refactor xattr list and remove ocfs2_xattr_handler().
      ocfs2: Calculate EA hash only by its suffix.
      ocfs2: Move trusted and user attribute support into xattr.c
      ocfs2: Uninline ocfs2_xattr_name_hash()
      ocfs2: Don't check for NULL before brelse()
      ocfs2: use smaller counters in ocfs2_remove_xattr_clusters_from_cache
      ocfs2: Documentation update for user_xattr / nouser_xattr mount options
      ocfs2: make la_debug_mutex static
      ocfs2: Remove pointless !!
      ocfs2: Add empty bucket support in xattr.
      ocfs2/xattr.c: Fix a bug when inserting xattr.
      ocfs2: Add xattr mount option in ocfs2_show_options()
      ocfs2: Switch over to JBD2.
      ocfs2: Add the 'inode64' mount option.
      ...
    acd15a83