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
dlm: proper types for asts and basts
2008-02-06 00:35:45 -06:00
[DLM] The core of the DLM for GFS2/CLVM
2006-01-18 09:30:29 +00:00
configfs: Allow ->make_item() and ->make_group() to return detailed errors.
2008-07-14 13:57:16 -07:00
dlm: recover nodes that are removed and re-added
2008-04-21 11:18:01 -05:00
dlm: add __init and __exit marks to init and exit functions
2008-02-06 23:41:22 -06:00
dlm: fix dlm_dir_lookup() handling of too long names
2008-02-04 01:30:19 -06:00
[DLM] The core of the DLM for GFS2/CLVM
2006-01-18 09:30:29 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
2008-04-22 13:44:23 -07:00
menuconfig: transform NLS and DLM menus
2007-10-17 08:43:00 -07:00
dlm: save master info after failed no-queue request
2008-04-21 11:18:01 -05:00
dlm: make dlm_print_rsb() static
2008-04-21 11:18:01 -05:00
fs: replace remaining __FUNCTION__ occurrences
2008-04-30 08:29:54 -07:00
[DLM] dlm: user locks
2006-07-13 09:25:34 -04:00
dlm: tcp_connect_to_sock should check for -EINVAL, not EINVAL
2008-05-19 15:37:27 -05:00
[DLM] Clean up lowcomms
2006-12-07 09:25:13 -05:00
[DLM] The core of the DLM for GFS2/CLVM
2006-01-18 09:30:29 +00:00
dlm: move plock code from gfs2
2008-04-21 11:22:28 -05:00
dlm: move plock code from gfs2
2008-04-21 11:22:28 -05:00
dlm: recover nodes that are removed and re-added
2008-04-21 11:18:01 -05:00
dlm: reject messages from non-members
2008-01-30 11:04:42 -06:00
dlm: add __init and __exit marks to init and exit functions
2008-02-06 23:41:22 -06:00
dlm: use dlm prefix on alloc and free functions
2008-01-29 17:17:19 -06:00
dlm: dlm_process_incoming_buffer() fixes
2008-02-04 01:22:42 -06:00
[DLM] The core of the DLM for GFS2/CLVM
2006-01-18 09:30:29 +00:00
dlm: section mismatch warning fix
2008-05-19 15:37:27 -05:00
dlm: fix plock dev_write return value
2008-05-19 15:37:27 -05:00
dlm: fix rcom_names message to self
2008-02-21 15:19:54 -06:00
[DLM] block dlm_recv in recovery transition
2007-10-10 08:56:38 +01:00
dlm: use proper type for ->ls_recover_buf
2008-02-04 01:24:07 -06:00
[DLM] The core of the DLM for GFS2/CLVM
2006-01-18 09:30:29 +00:00
dlm: recover nodes that are removed and re-added
2008-04-21 11:18:01 -05:00
[DLM] The core of the DLM for GFS2/CLVM
2006-01-18 09:30:29 +00:00
dlm: use proper C for dlm/requestqueue stuff (and fix alignment bug)
2008-02-04 01:21:32 -06:00
dlm: use proper C for dlm/requestqueue stuff (and fix alignment bug)
2008-02-04 01:21:32 -06:00
dlm-user: BKL pushdown
2008-06-20 14:05:56 -06:00
[DLM] dlm: user locks
2006-07-13 09:25:34 -04:00
dlm: do not byteswap rcom_config
2008-02-04 01:23:43 -06:00
[DLM] The core of the DLM for GFS2/CLVM
2006-01-18 09:30:29 +00:00
5b664cb235