Linus Torvalds 5b664cb235 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 ... * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: [PATCH] ocfs2: fix oops in mmap_truncate testing configfs: call drop_link() to cleanup after create_link() failure configfs: Allow ->make_item() and ->make_group() to return detailed errors. configfs: Fix failing mkdir() making racing rmdir() fail configfs: Fix deadlock with racing rmdir() and rename() configfs: Make configfs_new_dirent() return error code instead of NULL configfs: Protect configfs_dirent s_links list mutations configfs: Introduce configfs_dirent_lock ocfs2: Don't snprintf() without a format. ocfs2: Fix CONFIG_OCFS2_DEBUG_FS #ifdefs ocfs2/net: Silence build warnings on sparc64 ocfs2: Handle error during journal load ocfs2: Silence an error message in ocfs2_file_aio_read() ocfs2: use simple_read_from_buffer() ocfs2: fix printk format warnings with OCFS2_FS_STATS=n [PATCH 2/2] ocfs2: Instrument fs cluster locks [PATCH 1/2] ocfs2: Add CONFIG_OCFS2_FS_STATS config option		2008-07-17 10:55:51 -07:00
..
ast.c
ast.h
config.c	configfs: Allow ->make_item() and ->make_group() to return detailed errors.	2008-07-14 13:57:16 -07:00
config.h	dlm: recover nodes that are removed and re-added	2008-04-21 11:18:01 -05:00
debug_fs.c
dir.c
dir.h
dlm_internal.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm	2008-04-22 13:44:23 -07:00
Kconfig
lock.c	dlm: save master info after failed no-queue request	2008-04-21 11:18:01 -05:00
lock.h
lockspace.c	fs: replace remaining __FUNCTION__ occurrences	2008-04-30 08:29:54 -07:00
lockspace.h
lowcomms.c	dlm: tcp_connect_to_sock should check for -EINVAL, not EINVAL	2008-05-19 15:37:27 -05:00
lowcomms.h
lvb_table.h
main.c	dlm: move plock code from gfs2	2008-04-21 11:22:28 -05:00
Makefile	dlm: move plock code from gfs2	2008-04-21 11:22:28 -05:00
member.c	dlm: recover nodes that are removed and re-added	2008-04-21 11:18:01 -05:00
member.h
memory.c
memory.h
midcomms.c
midcomms.h
netlink.c	dlm: section mismatch warning fix	2008-05-19 15:37:27 -05:00
plock.c	dlm: fix plock dev_write return value	2008-05-19 15:37:27 -05:00
rcom.c
rcom.h
recover.c
recover.h
recoverd.c	dlm: recover nodes that are removed and re-added	2008-04-21 11:18:01 -05:00
recoverd.h
requestqueue.c
requestqueue.h
user.c	dlm-user: BKL pushdown	2008-06-20 14:05:56 -06:00
user.h
util.c
util.h