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

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

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

VFS: move the f_delown processing from lease_modify() into a new default lock 
manager fl_release_private callback.

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


[-- Attachment #2: linux-2.6.9-rc2-05-default-fl-release-priv.dif --]
[-- Type: text/plain , Size: 866 bytes --]

diff --recursive -puN old/fs/locks.c new/fs/locks.c
--- old/fs/locks.c	2004-09-20 13:32:53.980216000 -0400
+++ new/fs/locks.c	2004-09-20 13:36:41.571386000 -0400
@@ -395,8 +395,18 @@ static void lease_break_callback(struct 
 	kill_fasync(&fl->fl_fasync, SIGIO, POLL_MSG);
 }
 
+static void lease_release_private_callback(struct file_lock *fl)
+{
+	if (!fl->fl_file)
+		return;
+
+	f_delown(fl->fl_file);
+		fl->fl_file->f_owner.signum = 0;
+}
+
 struct lock_manager_operations lease_manager_ops = {
 	.fl_break = lease_break_callback,
+	.fl_release_private = lease_release_private_callback,
 };
 
 /*
@@ -1051,10 +1061,6 @@ static int lease_modify(struct file_lock
 		return error;
 	locks_wake_up_blocks(fl);
 	if (arg == F_UNLCK) {
-		struct file *filp = fl->fl_file;
-
-		f_delown(filp);
-		filp->f_owner.signum = 0;
 		locks_delete_lock(before);
 	}
 	return 0;