Linus Torvalds 2d56d3c43c Merge branch 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linux ... * 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linux: gfs2: nfs lock support for gfs2 lockd: add code to handle deferred lock requests lockd: always preallocate block in nlmsvc_lock() lockd: handle test_lock deferrals lockd: pass cookie in nlmsvc_testlock lockd: handle fl_grant callbacks lockd: save lock state on deferral locks: add fl_grant callback for asynchronous lock return nfsd4: Convert NFSv4 to new lock interface locks: add lock cancel command locks: allow {vfs,posix}_lock_file to return conflicting lock locks: factor out generic/filesystem switch from setlock code locks: factor out generic/filesystem switch from test_lock locks: give posix_test_lock same interface as ->lock locks: make ->lock release private data before returning in GETLK case locks: create posix-to-flock helper functions locks: trivial removal of unnecessary parentheses		2007-05-07 12:34:24 -07:00
..
control.c	[PATCH] mark struct inode_operations const 1	2007-02-12 09:48:46 -08:00
dev.c	[PATCH] slab: remove kmem_cache_t	2006-12-07 08:39:25 -08:00
dir.c	[PATCH] fuse: validate rootmode mount option	2007-04-08 19:47:55 -07:00
file.c	locks: give posix_test_lock same interface as ->lock	2007-05-06 17:39:00 -04:00
fuse_i.h	[PATCH] fuse: validate rootmode mount option	2007-04-08 19:47:55 -07:00
inode.c	slab allocators: Remove SLAB_DEBUG_INITIAL flag	2007-05-07 12:12:57 -07:00
Makefile	[PATCH] fuse: add control filesystem	2006-06-25 10:01:19 -07:00