---

yaml --- r: 320403 b: refs/heads/master c: 3b6e272 h: refs/heads/master i: 320401: fb13001 320399: fda9831 v: v3
git-mirror · Jul 27, 2012 · fba18a0 · fba18a0
1 parent 7730c81
commit fba18a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57c8b13e3cd0f94944c9691ce7f58e5fcef8a12d
+refs/heads/master: 3b6e2723f32de42028617f2c99b244ccd72cd959
diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
@@ -427,18 +427,8 @@ static void lease_break_callback(struct file_lock *fl)
 	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;
-}
-
 static const struct lock_manager_operations lease_manager_ops = {
 	.lm_break = lease_break_callback,
-	.lm_release_private = lease_release_private_callback,
 	.lm_change = lease_modify,
 };
 
@@ -1155,8 +1145,13 @@ int lease_modify(struct file_lock **before, int arg)
 		return error;
 	lease_clear_pending(fl, arg);
 	locks_wake_up_blocks(fl);
-	if (arg == F_UNLCK)
+	if (arg == F_UNLCK) {
+		struct file *filp = fl->fl_file;
+
+		f_delown(filp);
+		filp->f_owner.signum = 0;
 		locks_delete_lock(before);
+	}
 	return 0;
 }