Would it still be possible to merge this for 2.6.23? They've been through linux-fsdevel, Christoph has taken a pass through them, and I don't know of any unaddressed problems. --b. On Fri, Jul 13, 2007 at 07:34:57PM -0400, J. Bruce Fields wrote: > Please pull from the 'for-linus' branch at > > git://linux-nfs.org/~bfields/linux.git for-linus > > for a series of patches which add a setlease() file method. The > longer-term goal is to allow cluster and network filesystems to give out > consistent leases when possible, in particular to allow nfsd to give out > delegations on cluster filesystems. For now, though, we're using this > just to disallow leases selectively on certain filesystems (nfs and gfs2 > for now) where they don't make sense. > > Also includes some minor locks.c cleanup. > > J. Bruce Fields (9): > locks: convert an -EINVAL return to a BUG > locks: clean up lease_alloc() > locks: share more common lease code > locks: rename lease functions to reflect locks.c conventions > locks: provide a file lease method enabling cluster-coherent leases > locks: export setlease to filesystems > nfs: disable leases over NFS > locks: make posix_test_lock() interface more consistent > locks: fix vfs_test_lock() comment > > Marc Eshel (1): > gfs2: stop giving out non-cluster-coherent leases > > david m. richter (1): > leases: minor break_lease() comment clarification > > fs/gfs2/ops_file.c | 24 +++++++++++ > fs/locks.c | 112 ++++++++++++++++++++++++++------------------------ > fs/nfs/file.c | 16 +++++++- > fs/nfsd/nfs4state.c | 10 ++-- > include/linux/fs.h | 4 +- > 5 files changed, 105 insertions(+), 61 deletions(-) > - > To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html - To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
