commit 1b7fa4c27111757789b21bb78543317dad4cfd08
author Linus Torvalds <torvalds@linux-foundation.org> Fri Jul 06 10:04:39 2012 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Jul 06 10:04:39 2012 -0700
tree a160c42485acf01ade88bee0d7f1d775a4eb3002
parent 064ea1ae80749f5548a5613e8c7772fbef34c857
parent 2dfd06036ba7ae8e7be2daf5a2fff1dac42390bf

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

Pull ocfs2 fixes from Joel Becker.

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  aio: make kiocb->private NUll in init_sync_kiocb()
  ocfs2: Fix bogus error message from ocfs2_global_read_info
  ocfs2: for SEEK_DATA/SEEK_HOLE, return internal error unchanged if ocfs2_get_clusters_nocache() or ocfs2_inode_lock() call failed.
  ocfs2: use spinlock irqsave for downconvert lock.patch
  ocfs2: Misplaced parens in unlikley
  ocfs2: clear unaligned io flag when dio fails