* PATCH [9/10] lease interfaces for version 4 NFSD
@ 2004-09-20 20:23 William A.(Andy) Adamson
0 siblings, 0 replies; 2+ messages in thread
From: William A.(Andy) Adamson @ 2004-09-20 20:23 UTC (permalink / raw)
To: linux-fsdevel; +Cc: andros
[-- Attachment #1: Type: text/plain, Size: 162 bytes --]
VFS: export remove_lease(), an interface to time_out_leases() with a
fl_break_time in the past. needed by nfsd.
Signed-off-by: Andy Adamson <andros@umich.edu>
[-- Attachment #2: linux-2.6.9-rc2-09-remove-lease.dif --]
[-- Type: text/plain , Size: 1468 bytes --]
diff --recursive -puN old/fs/locks.c new/fs/locks.c
--- old/fs/locks.c 2004-09-20 14:18:58.644037000 -0400
+++ new/fs/locks.c 2004-09-20 14:34:10.952756000 -0400
@@ -1086,6 +1086,26 @@ static void time_out_leases(struct inode
}
/**
+ * remove_lease - let time_out_leases remove the lease.
+ * @@file_lock: the lease to remove
+ */
+void remove_lease(struct file_lock *fl)
+{
+ if (!IS_LEASE(fl))
+ return;
+
+ lock_kernel();
+
+ fl->fl_type = F_UNLCK | F_INPROGRESS;
+ fl->fl_break_time = jiffies - 10;
+ time_out_leases(fl->fl_file->f_dentry->d_inode);
+
+ unlock_kernel();
+}
+
+EXPORT_SYMBOL(remove_lease);
+
+/**
* __break_lease - revoke all outstanding leases on file
* @inode: the inode of the file to return
* @mode: the open mode (read or write)
diff --recursive -puN old/include/linux/fs.h new/include/linux/fs.h
--- old/include/linux/fs.h 2004-09-20 14:27:37.183726000 -0400
+++ new/include/linux/fs.h 2004-09-20 14:35:42.696076000 -0400
@@ -702,6 +702,7 @@ extern int flock_lock_file_wait(struct f
extern int __break_lease(struct inode *inode, unsigned int flags);
extern void lease_get_mtime(struct inode *, struct timespec *time);
extern int setlease(struct file *, long, struct file_lock **);
+extern void remove_lease(struct file_lock *);
extern int lock_may_read(struct inode *, loff_t start, unsigned long count);
extern int lock_may_write(struct inode *, loff_t start, unsigned long count);
extern void steal_locks(fl_owner_t from);
^ permalink raw reply [flat|nested] 2+ messages in thread* PATCH [9/10] lease interfaces for version 4 NFSD
@ 2004-09-20 20:23 William A.(Andy) Adamson
0 siblings, 0 replies; 2+ messages in thread
From: William A.(Andy) Adamson @ 2004-09-20 20:23 UTC (permalink / raw)
To: linux-fsdevel; +Cc: andros
[-- Attachment #1: Type: text/plain, Size: 110 bytes --]
VFS: add the new lock manager callbacks to the documentation
Signed-off-by: Andy Adamson <andros@umich.edu>
[-- Attachment #2: linux-2.6.9-rc2-10-lease-doc.dif --]
[-- Type: text/plain , Size: 1107 bytes --]
diff --recursive -puN old/Documentation/filesystems/Locking new/Documentation/filesystems/Locking
--- old/Documentation/filesystems/Locking 2004-09-13 01:33:23.000000000 -0400
+++ new/Documentation/filesystems/Locking 2004-09-20 14:48:49.093136000 -0400
@@ -295,13 +295,19 @@ fl_release_private: yes yes
prototypes:
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 *);
+ void (*fl_break)(struct file_lock *); /* break_lease callback */
locking rules:
BKL may block
fl_compare_owner: yes no
fl_notify: yes no
+fl_copy_lock: yes no
+fl_release_private: yes yes
+fl_break: yes no
- Currently only NLM provides instances of this class. None of the
+ Currently only NFSd and NLM provide instances of this class. None of the
them block. If you have out-of-tree instances - please, show up. Locking
in that area will change.
--------------------------- buffer_head -----------------------------------
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-09-20 20:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-09-20 20:23 PATCH [9/10] lease interfaces for version 4 NFSD William A.(Andy) Adamson
-- strict thread matches above, loose matches on Subject: below --
2004-09-20 20:23 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).