PATCH [4/10] lease interfaces for version 4 NFSD

["William A.(Andy) Adamson" <andros@citi.umich.edu>]

[-- Attachment #1: Type: text/plain, Size: 147 bytes --]

VFS: seperate the lease initialization code from lease_alloc. set the default 
lock manager ops.

Signed-off-by: Andy Adamson <andros@umich.edu>



[-- Attachment #2: linux-2.6.9-rc2-04-lease-init.dif --]
[-- Type: text/plain , Size: 1225 bytes --]

diff --recursive -puN old/fs/locks.c new/fs/locks.c
--- old/fs/locks.c	2004-09-20 15:40:07.512097000 -0400
+++ new/fs/locks.c	2004-09-20 15:57:19.435106000 -0400
@@ -399,13 +399,11 @@ struct lock_manager_operations lease_man
 	.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)
+/*
+ * Initialize a lease, use the default lock manager operations
+ */
+static int lease_init(struct file *filp, int type, struct file_lock *fl)
 {
-	struct file_lock *fl = locks_alloc_lock();
-	if (fl == NULL)
-		return -ENOMEM;
-
 	fl->fl_owner = current->files;
 	fl->fl_pid = current->tgid;
 
@@ -418,8 +416,18 @@ static int lease_alloc(struct file *filp
 	fl->fl_start = 0;
 	fl->fl_end = OFFSET_MAX;
 	fl->fl_ops = NULL;
-	fl->fl_lmops = NULL;
+	fl->fl_lmops = &lease_manager_ops;
+	return 0;
+}
 
+/* Allocate a file_lock initialised to this type of lease */
+static int lease_alloc(struct file *filp, int type, struct file_lock **flp)
+{
+	struct file_lock *fl = locks_alloc_lock();
+	if (fl == NULL)
+		return -ENOMEM;
+	if ((error = lease_init(filp, type, fl)))
+		return error;
 	*flp = fl;
 	return 0;
 }