Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
commit849254e9bba985e281526b57c02562c7a49a2fcf
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Dec 2009 21:33:07 +0000 (23 13:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Dec 2009 21:33:07 +0000 (23 13:33 -0800)
treea061f4de1c7b2836185e9d5bd4d7871c79692ca4
parent6f40334694dce047d43c6f2cce255b596da6de50
parent10cf1a02f444fdcd50be47cce3fa8bf08251dd9c
Merge branch 'upstream-linus' of git://git./linux/kernel/git/jlbec/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  ocfs2: Set i_nlink properly during reflink.
  ocfs2: Add reflinked file's inode to inode hash eariler.
  ocfs2: refcounttree.c cleanup.
  ocfs2: Find proper end cpos for a leaf refcount block.
fs/ocfs2/alloc.c
fs/ocfs2/refcounttree.c