From mboxrd@z Thu Jan 1 00:00:00 1970 From: "William A.(Andy) Adamson" Subject: PATCH [1/10] lease interfaces for version 4 NFSD Date: Mon, 20 Sep 2004 16:22:30 -0400 Sender: linux-fsdevel-owner@vger.kernel.org Message-ID: <20040920202230.0A9E81BBA3@citi.umich.edu> Mime-Version: 1.0 Content-Type: multipart/mixed ; boundary="==_Exmh_-5113411520" Cc: andros@citi.umich.edu Return-path: Received: from citi.umich.edu ([141.211.133.111]:26476 "EHLO citi.umich.edu") by vger.kernel.org with ESMTP id S267303AbUITUWd (ORCPT ); Mon, 20 Sep 2004 16:22:33 -0400 To: linux-fsdevel@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org This is a multipart MIME message. --==_Exmh_-5113411520 Content-Type: text/plain; charset=us-ascii VFS: add a lock manager copy lock callback to locks_copy_lock() so that nfsd can set lease properties. Signed-off-by: Andy Adamson --==_Exmh_-5113411520 Content-Type: text/plain ; name="linux-2.6.9-rc2-01-lmops-copy-lock.dif"; charset=us-ascii Content-Description: linux-2.6.9-rc2-01-lmops-copy-lock.dif Content-Disposition: attachment; filename="linux-2.6.9-rc2-01-lmops-copy-lock.dif" diff --recursive -puN old/fs/locks.c new/fs/locks.c --- old/fs/locks.c 2004-09-13 01:33:36.000000000 -0400 +++ new/fs/locks.c 2004-09-20 12:57:50.911796000 -0400 @@ -227,6 +227,8 @@ void locks_copy_lock(struct file_lock *n new->fl_lmops = fl->fl_lmops; if (fl->fl_ops && fl->fl_ops->fl_copy_lock) fl->fl_ops->fl_copy_lock(new, fl); + if (fl->fl_lmops && fl->fl_lmops->fl_copy_lock) + fl->fl_lmops->fl_copy_lock(new, fl); } EXPORT_SYMBOL(locks_copy_lock); diff --recursive -puN old/include/linux/fs.h new/include/linux/fs.h --- old/include/linux/fs.h 2004-09-13 01:31:58.000000000 -0400 +++ new/include/linux/fs.h 2004-09-20 12:58:13.891126000 -0400 @@ -633,6 +633,7 @@ struct file_lock_operations { struct lock_manager_operations { int (*fl_compare_owner)(struct file_lock *, struct file_lock *); void (*fl_notify)(struct file_lock *); /* unblock callback */ + void (*fl_copy_lock)(struct file_lock *, struct file_lock *); }; /* that will die - we need it for nfs_lock_info */ --==_Exmh_-5113411520--