tree b774ed6e13751f590038c1d0454436326339cd62
parent a5d1792847172077d173c959c37d4562b9ec69e6
parent cef0893dcf1fdf22943aa49e75ee1eb3bfffe5f5
author Linus Torvalds <torvalds@g5.osdl.org> 1147907501 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1147907501 -0700

Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2

* 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2:
  configfs: Make sure configfs_init() is called before consumers.
  configfs: configfs_mkdir() failed to cleanup linkage.
  configfs: Fix a reference leak in configfs_mkdir().
  ocfs2: fix gfp mask in some file system paths
  ocfs2: Don't populate uptodate cache in ocfs2_force_read_journal()
  ocfs2: take meta data lock in ocfs2_file_aio_read()
  ocfs2: take data locks around extend