Linus Torvalds 49d41bae46 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm ...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: add recovery callbacks
  dlm: add node slots and generation
  dlm: move recovery barrier calls
  dlm: convert rsb list to rb_tree

2012-01-10 14:55:55 -08:00

..

ast.c

dlm: don't limit active work items

2011-07-19 14:22:32 -05:00

ast.h

dlm: use workqueue for callbacks

2011-07-15 12:30:43 -05:00

config.c

dlm: add recovery callbacks

2012-01-04 08:56:31 -06:00

config.h

dlm: add recovery callbacks

2012-01-04 08:56:31 -06:00

debug_fs.c

dlm: convert rsb list to rb_tree

2011-11-18 10:20:15 -06:00

dir.c

dlm: move recovery barrier calls

2012-01-04 08:53:27 -06:00

dir.h

…

dlm_internal.h

dlm: add recovery callbacks

2012-01-04 08:56:31 -06:00

Kconfig

dlm: Make DLM depend on CONFIGFS_FS

2011-01-16 21:22:37 +00:00

lock.c

dlm: convert rsb list to rb_tree

2011-11-18 10:20:15 -06:00

lock.h

dlm: delayed reply message warning

2011-04-01 14:19:06 -05:00

lockspace.c

dlm: add recovery callbacks

2012-01-04 08:56:31 -06:00

lockspace.h

…

lowcomms.c

net: remove ipv6_addr_copy()

2011-11-22 16:43:32 -05:00

lowcomms.h

…

lvb_table.h

…

main.c

dlm: Drop __TIME__ usage

2011-05-26 09:46:17 +02:00

Makefile

…

member.c

dlm: add recovery callbacks

2012-01-04 08:56:31 -06:00

member.h

dlm: add recovery callbacks

2012-01-04 08:56:31 -06:00

memory.c

dlm: improve rsb searches

2011-07-12 16:02:09 -05:00

memory.h

dlm: improve rsb searches

2011-07-12 16:02:09 -05:00

midcomms.c

…

midcomms.h

…

netlink.c

…

plock.c

locks: rename lock-manager ops

2011-07-20 20:23:19 -04:00

rcom.c

dlm: add node slots and generation

2012-01-04 08:55:57 -06:00

rcom.h

dlm: add node slots and generation

2012-01-04 08:55:57 -06:00

recover.c

dlm: add node slots and generation

2012-01-04 08:55:57 -06:00

recover.h

…

recoverd.c

dlm: add recovery callbacks

2012-01-04 08:56:31 -06:00

recoverd.h

…

requestqueue.c

…

requestqueue.h

…

user.c

dlm: add recovery callbacks

2012-01-04 08:56:31 -06:00

user.h

dlm: record full callback state

2011-03-10 10:40:00 -06:00

util.c

…

util.h

…