Linus Torvalds 0a4ebed781 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: (31 commits) ocfs2: avoid unaligned access to dqc_bitmap ocfs2: Use filemap_write_and_wait() instead of write_inode_now() ocfs2: honor O_(D)SYNC flag in fallocate ocfs2: Add a missing journal credit in ocfs2_link_credits() -v2 ocfs2: send correct UUID to cleancache initialization ocfs2: Commit transactions in error cases -v2 ocfs2: make direntry invalid when deleting it fs/ocfs2/dlm/dlmlock.c: free kmem_cache_zalloc'd data using kmem_cache_free ocfs2: Avoid livelock in ocfs2_readpage() ocfs2: serialize unaligned aio ocfs2: Implement llseek() ocfs2: Fix ocfs2_page_mkwrite() ocfs2: Add comment about orphan scanning ocfs2: Clean up messages in the fs ocfs2/cluster: Cluster up now includes network connections too ocfs2/cluster: Add new function o2net_fill_node_map() ocfs2/cluster: Fix output in file elapsed_time_in_ms ocfs2/dlm: dlmlock_remote() needs to account for remastery ocfs2/dlm: Take inflight reference count for remotely mastered resources too ocfs2/dlm: Cleanup dlm_wait_for_node_death() and dlm_wait_for_node_recovery() ...		2011-12-01 14:55:34 -08:00
..
dlmapi.h
dlmast.c
dlmcommon.h	ocfs2/dlm: Cleanup dlm_wait_for_node_death() and dlm_wait_for_node_recovery()	2011-07-24 10:28:54 -07:00
dlmconvert.c	ocfs2: Remove ENTRY from masklog.	2011-02-21 11:10:44 +08:00
dlmconvert.h
dlmdebug.c	fs: add export.h to files using EXPORT_SYMBOL/THIS_MODULE macros	2011-10-31 19:30:31 -04:00
dlmdebug.h
dlmdomain.c	ocfs2/cluster: Cluster up now includes network connections too	2011-07-24 10:33:54 -07:00
dlmdomain.h
dlmlock.c	fs/ocfs2/dlm/dlmlock.c: free kmem_cache_zalloc'd data using kmem_cache_free	2011-11-17 01:46:46 -08:00
dlmmaster.c	ocfs2/dlm: Take inflight reference count for remotely mastered resources too	2011-07-24 10:29:54 -07:00
dlmrecovery.c	ocfs2/dlm: Cleanup dlm_wait_for_node_death() and dlm_wait_for_node_recovery()	2011-07-24 10:28:54 -07:00
dlmthread.c	ocfs2/dlm: Take inflight reference count for remotely mastered resources too	2011-07-24 10:29:54 -07:00
dlmunlock.c	ocfs2: Remove ENTRY from masklog.	2011-02-21 11:10:44 +08:00
dlmver.c
dlmver.h
Makefile	fs: change to new flag variable	2011-03-17 14:02:57 +01:00