RESEND lease interfaces for version 4 NFSD
Subsystems (2)
PATCH 1/1 RESEND lease interfaces for version 4 NFSD
VFS: add a lock manager break callback to break_lease() for lock managers to initiate breaking a lease.
VFS: move the break_lease() kill_fasync() call to a default lock manager fl_break callback
Signed-off-by Andy Adamson <[email protected]>
---
linux-2.6.9-rc2-andros/fs/locks.c | 15 ++++++++++++++- linux-2.6.9-rc2-andros/include/linux/fs.h | 1 + 2 files changed, 15 insertions(+), 1 deletion(-)
fs/locks.c renamed from fs/locks.c~lmops-break +14 -1
@@ -390,6 +390,16 @@ static int flock64_to_posix_lock(struct }#endif +/* default lease lock manager operations */ +static void lease_break_callback (struct file_lock *fl) +{ +kill_fasync (&fl->fl_fasync,SIGIO ,POLL_MSG ); +} + +struct lock_manager_operations lease_manager_ops = { + .fl_break = lease_break_callback, +}; +/* Allocate a file_lock initialised to this type of lease */ static int lease_alloc (struct file *filp,int type,struct file_lock **flp) {
@@ -1125,7 +1135,10 @@ int __break_lease(struct inode *inode, uif (fl->fl_type != future) { fl->fl_type = future; fl->fl_break_time = break_time; -kill_fasync (&fl->fl_fasync,SIGIO ,POLL_MSG ); +if (fl->fl_lmops && fl->fl_lmops->fl_break) + fl->fl_lmops->fl_break (fl); +else /* lease must have lmops break callback */ +BUG (); } }
include/linux/fs.h renamed from include/linux/fs.h~lmops-break +1 -0
@@ -635,6 +635,7 @@ struct lock_manager_operations {void (*fl_notify)(struct file_lock *);/* unblock callback */ void (*fl_copy_lock)(struct file_lock *,struct file_lock *);void (*fl_release_private)(struct file_lock *); +void (*fl_break)(struct file_lock *); };/* that will die - we need it for nfs_lock_info */
_