| commit | 849254e9bba985e281526b57c02562c7a49a2fcf | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 23 13:33:07 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Dec 23 13:33:07 2009 -0800 |
| tree | a061f4de1c7b2836185e9d5bd4d7871c79692ca4 | |
| parent | 6f40334694dce047d43c6f2cce255b596da6de50 [diff] | |
| parent | 10cf1a02f444fdcd50be47cce3fa8bf08251dd9c [diff] |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/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.