You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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() ...		13 years ago
..
Makefile	fs: change to new flag variable	14 years ago
dlmapi.h	ocfs2/trivial: Remove trailing whitespaces	15 years ago
dlmast.c	ocfs2/dlm: Cleanup mlogs in dlmthread.c, dlmast.c and dlmdomain.c	14 years ago
dlmcommon.h	ocfs2/dlm: Cleanup dlm_wait_for_node_death() and dlm_wait_for_node_recovery()	14 years ago
dlmconvert.c	ocfs2: Remove ENTRY from masklog.	14 years ago
dlmconvert.h	…
dlmdebug.c	fs: add export.h to files using EXPORT_SYMBOL/THIS_MODULE macros	13 years ago
dlmdebug.h	ocfs2/dlm: Cleanup dlmdebug.c	14 years ago
dlmdomain.c	ocfs2/cluster: Cluster up now includes network connections too	14 years ago
dlmdomain.h	…
dlmlock.c	fs/ocfs2/dlm/dlmlock.c: free kmem_cache_zalloc'd data using kmem_cache_free	13 years ago
dlmmaster.c	ocfs2/dlm: Take inflight reference count for remotely mastered resources too	14 years ago
dlmrecovery.c	ocfs2/dlm: Cleanup dlm_wait_for_node_death() and dlm_wait_for_node_recovery()	14 years ago
dlmthread.c	ocfs2/dlm: Take inflight reference count for remotely mastered resources too	14 years ago
dlmunlock.c	ocfs2: Remove ENTRY from masklog.	14 years ago
dlmver.c	…
dlmver.h	…