Linus Torvalds 498f7f505d 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: (22 commits) MAINTAINERS: Update Joel Becker's email address ocfs2: Remove unused truncate function from alloc.c ocfs2/cluster: dereferencing before checking in nst_seq_show() ocfs2: fix build for OCFS2_FS_STATS not enabled ocfs2/cluster: Show o2net timing statistics ocfs2/cluster: Track process message timing stats for each socket ocfs2/cluster: Track send message timing stats for each socket ocfs2/cluster: Use ktime instead of timeval in struct o2net_sock_container ocfs2/cluster: Replace timeval with ktime in struct o2net_send_tracking ocfs2: Add DEBUG_FS dependency ocfs2/dlm: Hard code the values for enums ocfs2/dlm: Minor cleanup ocfs2/dlm: Cleanup dlmdebug.c ocfs2: Release buffer_head in case of error in ocfs2_double_lock. ocfs2/cluster: Pin the local node when o2hb thread starts ocfs2/cluster: Show pin state for each o2hb region ocfs2/cluster: Pin/unpin o2hb regions ocfs2/cluster: Remove dropped region from o2hb quorum region bitmap ocfs2/cluster: Pin the remote node item in configfs ocfs2/dlm: make existing convertion precedent over new lock ...		2011-01-11 11:28:34 -08:00
..
cluster	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2011-01-11 11:28:34 -08:00
dlm	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2011-01-11 11:28:34 -08:00
dlmfs	fs: icache RCU free inodes	2011-01-07 17:50:26 +11:00
acl.c	fs: provide rcu-walk aware permission i_ops	2011-01-07 17:50:29 +11:00
acl.h	fs: provide rcu-walk aware permission i_ops	2011-01-07 17:50:29 +11:00
alloc.c	ocfs2: Remove unused truncate function from alloc.c	2011-01-07 18:03:00 -08:00
alloc.h	ocfs2: Remove unused truncate function from alloc.c	2011-01-07 18:03:00 -08:00
aops.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2011-01-11 11:28:34 -08:00
aops.h	Ocfs2: Teach 'coherency=full' O_DIRECT writes to correctly up_read i_alloc_sem.	2010-12-09 15:36:48 -08:00
blockcheck.c
blockcheck.h
buffer_head_io.c
buffer_head_io.h
dcache.c	fs: dcache per-inode inode alias locking	2011-01-07 17:50:31 +11:00
dcache.h
dir.c	ocfs2: Hold ip_lock when set/clear flags for indexed dir.	2010-12-16 00:36:15 -08:00
dir.h
dlmglue.c
dlmglue.h
export.c	fs: dcache reduce branches in lookup path	2011-01-07 17:50:28 +11:00
export.h
extent_map.c
extent_map.h
file.c	fs: provide rcu-walk aware permission i_ops	2011-01-07 17:50:29 +11:00
file.h	fs: provide rcu-walk aware permission i_ops	2011-01-07 17:50:29 +11:00
heartbeat.c
heartbeat.h
inode.c
inode.h
ioctl.c
ioctl.h
journal.c
journal.h
Kconfig	ocfs2: Add DEBUG_FS dependency	2010-12-22 18:34:48 -08:00
localalloc.c
localalloc.h
locks.c
locks.h
Makefile
mmap.c
mmap.h
namei.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2011-01-11 11:28:34 -08:00
namei.h
ocfs1_fs_compat.h
ocfs2_fs.h	ocfs2: Fix system inodes cache overflow.	2010-12-22 02:35:36 -08:00
ocfs2_ioctl.h
ocfs2_lockid.h
ocfs2_lockingver.h
ocfs2.h	ocfs2: Try to free truncate log when meeting ENOSPC in write.	2010-12-16 00:46:02 -08:00
quota_global.c
quota_local.c
quota.h
refcounttree.c
refcounttree.h
reservations.c
reservations.h
resize.c
resize.h
slot_map.c
slot_map.h
stack_o2cb.c
stack_user.c	ocfs2_connection_find() returns pointer to bad structure	2010-11-18 15:41:41 -08:00
stackglue.c
stackglue.h
suballoc.c
suballoc.h
super.c	fs: icache RCU free inodes	2011-01-07 17:50:26 +11:00
super.h
symlink.c
symlink.h
sysfile.c
sysfile.h
uptodate.c
uptodate.h
ver.c
ver.h
xattr.c
xattr.h