Skip to contentSkip to conversation

PATCH [9/10] lease interfaces for version 4 NFSD

PATCH William A.(Andy) Adamson 1 participant 1 message Sep 20, 2004

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

VFS: export remove_lease(), an interface to time_out_leases() with a fl_break_time in the past. needed by nfsd.

fs/locks.c +20 -0
diff --recursive -puN old/fs/locks.c new/fs/locks.c
@@ -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)
include/linux/fs.h +1 -0
diff --recursive -puN old/include/linux/fs.h new/include/linux/fs.h
@@ -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);