* PATCH [2/10] lease interfaces for version 4 NFSD
@ 2004-09-20 20:22 William A.(Andy) Adamson
0 siblings, 0 replies; only message in thread
From: William A.(Andy) Adamson @ 2004-09-20 20:22 UTC (permalink / raw)
To: linux-fsdevel; +Cc: andros
[-- 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 */
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2004-09-20 20:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-09-20 20:22 PATCH [2/10] lease interfaces for version 4 NFSD William A.(Andy) Adamson
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).