From: Andy Adamson <andros@thnk.citi.umich.edu>
To: linux-fsdevel@vger.kernel.org
Cc: nfsv4@linux-nfs.org, willy@debian.org
Subject: [PATCH 5 of 10] RESEND lease interfaces for version 4 NFSD
Date: Tue, 21 Sep 2004 18:36:01 -0400 [thread overview]
Message-ID: <1095804047.21441d5b.5@citi.umich.edu> (raw)
VFS: move the f_delown processing from lease_modify() into a new default lock
manager fl_release_private callback.
Signed-off-by: Andy Adamson <andros@citi.umich.edu>
---
linux-2.6.9-rc2-andros/fs/locks.c | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff -puN fs/locks.c~default-fl-release-priv fs/locks.c
--- linux-2.6.9-rc2/fs/locks.c~default-fl-release-priv 2004-09-21 18:00:27.703755568 -0400
+++ linux-2.6.9-rc2-andros/fs/locks.c 2004-09-21 18:00:27.707754960 -0400
@@ -396,8 +396,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,
};
/*
@@ -1054,13 +1064,8 @@ static int lease_modify(struct file_lock
if (error)
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;
+ if (arg == F_UNLCK)
locks_delete_lock(before);
- }
return 0;
}
_
reply other threads:[~2004-09-21 22:36 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=1095804047.21441d5b.5@citi.umich.edu \
--to=andros@thnk.citi.umich.edu \
--cc=linux-fsdevel@vger.kernel.org \
--cc=nfsv4@linux-nfs.org \
--cc=willy@debian.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).