From: "William A.(Andy) Adamson" <andros@citi.umich.edu>
To: linux-fsdevel@vger.kernel.org
Cc: andros@citi.umich.edu
Subject: PATCH [3/10] lease interfaces for version 4 NFSD
Date: Mon, 20 Sep 2004 16:22:35 -0400 [thread overview]
Message-ID: <20040920202235.A5CA21BBA3@citi.umich.edu> (raw)
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
VFS: add a lock manager break callback to break_lease() for lock manager to
initiate breaking a lease.
VFS: move the break_lease() kill_async() call to a default lock manager
fl_break callback.
Signed-off-by: Andy Adamson <andros@umich.edu>
[-- Attachment #2: linux-2.6.9-rc2-03-lmops-break.dif --]
[-- Type: text/plain , Size: 1522 bytes --]
diff --recursive -puN old/fs/locks.c new/fs/locks.c
--- old/fs/locks.c 2004-09-20 13:02:25.528046000 -0400
+++ new/fs/locks.c 2004-09-20 15:40:07.512097000 -0400
@@ -389,6 +389,16 @@ static int flock64_to_posix_lock(struct
}
#endif
+/* default lease lock manager operations */
+static void lease_break_callback(struct file_lock *fl)
+{
+ kill_fasync(&fl->fl_fasync, SIGIO, POLL_MSG);
+}
+
+struct lock_manager_operations lease_manager_ops = {
+ .fl_break = lease_break_callback,
+};
+
/* Allocate a file_lock initialised to this type of lease */
static int lease_alloc(struct file *filp, int type, struct file_lock **flp)
{
@@ -1124,7 +1134,10 @@ int __break_lease(struct inode *inode, u
if (fl->fl_type != future) {
fl->fl_type = future;
fl->fl_break_time = break_time;
- kill_fasync(&fl->fl_fasync, SIGIO, POLL_MSG);
+ if (fl->fl_lmops && fl->fl_lmops->fl_break)
+ fl->fl_lmops->fl_break(fl);
+ else /* lease must have lmops break callback */
+ BUG();
}
}
diff --recursive -puN old/include/linux/fs.h new/include/linux/fs.h
--- old/include/linux/fs.h 2004-09-20 13:03:12.621416000 -0400
+++ new/include/linux/fs.h 2004-09-20 13:06:31.333998000 -0400
@@ -635,6 +635,7 @@ struct lock_manager_operations {
void (*fl_notify)(struct file_lock *); /* unblock callback */
void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
void (*fl_release_private)(struct file_lock *);
+ void (*fl_break)(struct file_lock *);
};
/* that will die - we need it for nfs_lock_info */
reply other threads:[~2004-09-20 20:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040920202235.A5CA21BBA3@citi.umich.edu \
--to=andros@citi.umich.edu \
--cc=linux-fsdevel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).