From 53cef383f730b7e1be99532ec8c67b76218c88f0 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@redhat.com>
Date: Fri, 27 Jul 2012 16:18:00 -0400
Subject: [PATCH] --- yaml --- r: 320404 b: refs/heads/master c:
 96d6d59ceaeaacba4088862f3c57fcd011f52832 h: refs/heads/master v: v3

---
 [refs]           |  2 +-
 trunk/fs/locks.c | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index dfcf4ddf6943..4d86228eef69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b6e2723f32de42028617f2c99b244ccd72cd959
+refs/heads/master: 96d6d59ceaeaacba4088862f3c57fcd011f52832
diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
index 86668dd211ae..541075a41527 100644
--- a/trunk/fs/locks.c
+++ b/trunk/fs/locks.c
@@ -570,12 +570,6 @@ static void locks_delete_lock(struct file_lock **thisfl_p)
 	fl->fl_next = NULL;
 	list_del_init(&fl->fl_link);
 
-	fasync_helper(0, fl->fl_file, 0, &fl->fl_fasync);
-	if (fl->fl_fasync != NULL) {
-		printk(KERN_ERR "locks_delete_lock: fasync == %p\n", fl->fl_fasync);
-		fl->fl_fasync = NULL;
-	}
-
 	if (fl->fl_nspid) {
 		put_pid(fl->fl_nspid);
 		fl->fl_nspid = NULL;
@@ -1150,6 +1144,11 @@ int lease_modify(struct file_lock **before, int arg)
 
 		f_delown(filp);
 		filp->f_owner.signum = 0;
+		fasync_helper(0, fl->fl_file, 0, &fl->fl_fasync);
+		if (fl->fl_fasync != NULL) {
+			printk(KERN_ERR "locks_delete_lock: fasync == %p\n", fl->fl_fasync);
+			fl->fl_fasync = NULL;
+		}
 		locks_delete_lock(before);
 	}
 	return 0;