| commit | ff9cb43ce09a9069f0ec95375d2f403578ec4977 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Mar 14 11:59:22 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Mar 14 11:59:22 2009 -0700 |
| tree | e31981c31f663d98ddb02021d25c44c75f0355f1 | |
| parent | 2a4c13baebe30613cfa2c99d6a076f3a114dad9c [diff] | |
| parent | 712e53e46a1da35fcd88c05aa0c675b10f7c0e9d [diff] |
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: Use xs->bucket to set xattr value outside ocfs2: Fix a bug found by sparse check. ocfs2: tweak to get the maximum inline data size with xattr ocfs2: reserve xattr block for new directory with inline data