Linus Torvalds 03e62303cf 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: (47 commits) ocfs2: Silence a gcc warning. ocfs2: Don't retry xattr set in case value extension fails. ocfs2:dlm: avoid dlm->ast_lock lockres->spinlock dependency break ocfs2: Reset xattr value size after xa_cleanup_value_truncate(). fs/ocfs2/dlm: Use kstrdup fs/ocfs2/dlm: Drop memory allocation cast Ocfs2: Optimize punching-hole code. Ocfs2: Make ocfs2_find_cpos_for_left_leaf() public. Ocfs2: Fix hole punching to correctly do CoW during cluster zeroing. Ocfs2: Optimize ocfs2 truncate to use ocfs2_remove_btree_range() instead. ocfs2: Block signals for mkdir/link/symlink/O_CREAT. ocfs2: Wrap signal blocking in void functions. ocfs2/dlm: Increase o2dlm lockres hash size ocfs2: Make ocfs2_extend_trans() really extend. ocfs2/trivial: Code cleanup for allocation reservation. ocfs2: make ocfs2_adjust_resv_from_alloc simple. ocfs2: Make nointr a default mount option ocfs2/dlm: Make o2dlm domain join/leave messages KERN_NOTICE o2net: log socket state changes ocfs2: print node # when tcp fails ...		2010-05-21 07:20:17 -07:00
..
heartbeat.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
heartbeat.h	ocfs2/hb: Expose the list of heartbeating nodes via debugfs	2009-04-03 11:39:14 -07:00
Makefile	ocfs2/net: Add debug interface to o2net	2008-04-18 08:56:20 -07:00
masklog.c	ocfs2: allocation reservations	2010-05-05 18:17:30 -07:00
masklog.h	ocfs2: allocation reservations	2010-05-05 18:17:30 -07:00
netdebug.c	inet: rename some inet_sock fields	2009-10-18 18:52:53 -07:00
nodemanager.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
nodemanager.h	ocfs2/cluster: Make fence method configurable - v2	2009-12-02 16:49:26 -08:00
ocfs2_heartbeat.h	ocfs2: warn the user on a dead timeout mismatch	2006-06-29 15:45:35 -07:00
ocfs2_nodemanager.h
quorum.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
quorum.h
sys.c	ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb)	2008-04-30 17:07:59 -07:00
sys.h
tcp_internal.h	ocfs2/trivial: Remove trailing whitespaces	2010-01-25 19:20:51 -08:00
tcp.c	o2net: log socket state changes	2010-05-05 18:18:08 -07:00
tcp.h	[PATCH 1/3] ocfs2/net: Silence build warnings	2008-05-30 15:15:04 -07:00
ver.c	ocfs2: bump version number	2008-01-25 15:05:46 -08:00
ver.h