linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "William A.(Andy) Adamson" <andros@citi.umich.edu>
To: linux-fsdevel@vger.kernel.org
Cc: andros@citi.umich.edu
Subject: PATCH [2/10] lease interfaces for version 4 NFSD
Date: Mon, 20 Sep 2004 16:22:32 -0400	[thread overview]
Message-ID: <20040920202232.1334C1BBA4@citi.umich.edu> (raw)

[-- Attachment #1: Type: text/plain, Size: 151 bytes --]

VFS: add a lock manager release private callback to locks_free_lock() for lock 
manager lease clean-up

Signed-off-by: Andy Adamson <andros@umich.edu>

[-- Attachment #2: linux-2.6.9-rc2-02-lmops-release-priv.dif --]
[-- Type: text/plain , Size: 1040 bytes --]

diff --recursive -puN old/fs/locks.c new/fs/locks.c
--- old/fs/locks.c	2004-09-20 12:57:50.911796000 -0400
+++ new/fs/locks.c	2004-09-20 13:02:25.528046000 -0400
@@ -172,7 +172,11 @@ static inline void locks_free_lock(struc
 			fl->fl_ops->fl_release_private(fl);
 		fl->fl_ops = NULL;
 	}
-	fl->fl_lmops = NULL;
+	if (fl->fl_lmops) {
+		if (fl->fl_lmops->fl_release_private)
+			fl->fl_lmops->fl_release_private(fl);
+		fl->fl_lmops = NULL;
+	}
 
 	kmem_cache_free(filelock_cache, fl);
 }
diff --recursive -puN old/include/linux/fs.h new/include/linux/fs.h
--- old/include/linux/fs.h	2004-09-20 12:58:13.891126000 -0400
+++ new/include/linux/fs.h	2004-09-20 13:03:12.621416000 -0400
@@ -634,6 +634,7 @@ 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 *);
+	void (*fl_release_private)(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=20040920202232.1334C1BBA4@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).