James Morris ec98ce480a Merge branch 'master' into next ...

Conflicts:
	fs/nfsd/nfs4recover.c

Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().

Signed-off-by: James Morris <jmorris@namei.org>

2008-12-04 17:16:36 +11:00

..

dlmapi.h

ocfs2: Negotiate locking protocol versions.

2008-02-06 16:11:29 -08:00

dlmast.c

byteorder: move le32_add_cpu & friends from OCFS2 to core

2008-02-08 09:22:32 -08:00

dlmcommon.h

ocfs2/dlm: Move struct dlm_master_list_entry to dlmcommon.h

2008-04-18 08:56:09 -07:00

dlmconvert.c

ocfs2: Use dlm_print_one_lock_resource for lock resource print

2008-03-10 15:13:50 -07:00

dlmconvert.h

[PATCH] OCFS2: The Second Oracle Cluster Filesystem

2006-01-03 11:45:47 -08:00

dlmdebug.c

ocfs2/dlm: dlmdebug.c: make 2 functions static

2008-04-30 17:09:40 -07:00

dlmdebug.h

[PATCH 2/3] ocfs2/dlm: Silence build warnings

2008-05-30 15:15:10 -07:00

dlmdomain.c

ocfs2/dlm: Dump the dlm state in a debugfs file

2008-04-18 08:56:08 -07:00

dlmdomain.h

[PATCH] OCFS2: The Second Oracle Cluster Filesystem

2006-01-03 11:45:47 -08:00

dlmfs.c

Merge branch 'master' into next

2008-12-04 17:16:36 +11:00

dlmfsver.c

ocfs2: bump version number

2008-01-25 15:05:46 -08:00

dlmfsver.h

[PATCH] OCFS2: The Second Oracle Cluster Filesystem

2006-01-03 11:45:47 -08:00

dlmlock.c

ocfs2/dlm: Create slabcaches for lock and lockres

2008-04-18 08:56:08 -07:00

dlmmaster.c

[PATCH] ocfs2/dlm: Fixes oops in dlm_new_lockres()

2008-07-07 11:24:29 -07:00

dlmrecovery.c

ocfs2/dlm: Print message showing the recovery master

2008-03-10 15:14:14 -07:00

dlmthread.c

ocfs2/dlm: dlm_thread should not sleep while holding the dlm_spinlock

2008-03-10 15:14:17 -07:00

dlmunlock.c

ocfs2: Added post handler callable function in o2net message handler

2007-02-07 12:06:56 -08:00

dlmver.c

ocfs2: bump version number

2008-01-25 15:05:46 -08:00

dlmver.h

[PATCH] OCFS2: The Second Oracle Cluster Filesystem

2006-01-03 11:45:47 -08:00

Makefile

ocfs2: Only build ocfs2/dlm with the o2cb stack module

2008-04-18 08:56:12 -07:00

userdlm.c

ocfs2: Negotiate locking protocol versions.

2008-02-06 16:11:29 -08:00

userdlm.h

ocfs2: comments typo fix

2008-12-01 14:46:31 -08:00