From mboxrd@z Thu Jan 1 00:00:00 1970 From: "William A.(Andy) Adamson" Subject: PATCH [5/10] lease interfaces for version 4 NFSD Date: Mon, 20 Sep 2004 16:22:50 -0400 Sender: linux-fsdevel-owner@vger.kernel.org Message-ID: <20040920202250.8DCDD1BBA4@citi.umich.edu> Mime-Version: 1.0 Content-Type: multipart/mixed ; boundary="==_Exmh_-2578413600" Cc: andros@citi.umich.edu Return-path: Received: from citi.umich.edu ([141.211.133.111]:27909 "EHLO citi.umich.edu") by vger.kernel.org with ESMTP id S267313AbUITUWy (ORCPT ); Mon, 20 Sep 2004 16:22:54 -0400 To: linux-fsdevel@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org This is a multipart MIME message. --==_Exmh_-2578413600 Content-Type: text/plain; charset=us-ascii VFS: move the f_delown processing from lease_modify() into a new default lock manager fl_release_private callback. Signed-off-by: Andy Adamson --==_Exmh_-2578413600 Content-Type: text/plain ; name="linux-2.6.9-rc2-05-default-fl-release-priv.dif"; charset=us-ascii Content-Description: linux-2.6.9-rc2-05-default-fl-release-priv.dif Content-Disposition: attachment; filename="linux-2.6.9-rc2-05-default-fl-release-priv.dif" 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; --==_Exmh_-2578413600--