| commit | eda4b716ea1f2a647a39cebae66b3fae4c4b80e4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 23 16:36:48 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 23 16:36:48 2010 -0800 |
| tree | ab4318b72be4635c1213aa0def631e1169307660 | |
| parent | 55fb78a3a80348d87b2e3d79f61f8a9252dd86f5 [diff] | |
| parent | 7d8f98769e7f4bc29c38789daeb416c6a7d7c241 [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: Fix system inodes cache overflow. ocfs2: Hold ip_lock when set/clear flags for indexed dir. ocfs2: Adjust masklog flag values Ocfs2: Teach 'coherency=full' O_DIRECT writes to correctly up_read i_alloc_sem. ocfs2/dlm: Migrate lockres with no locks if it has a reference