tree 4d6ec6397598bb93e877ef84cdd6537a62736484
parent b2f051ae390432789f2b02fe451aa23ae2698e3d
parent e325a88f17196f18888f6e1426eb9fe3b4346d28
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1194649918 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1194649918 -0800

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: fix rename vs unlink race
  [PATCH] Fix possibly too long write in o2hb_setup_one_bio()
  ocfs2: fix write() performance regression
  ocfs2: Commit journal on sync writes
  ocfs2: Re-order iput in ocfs2_drop_dentry_lock
  ocfs2: Create locks at initially requested level
  [PATCH] Fix priority mistakes in fs/ocfs2/{alloc.c, dlmglue.c}
  [2.6 patch] make ocfs2_find_entry_el() static