fs/locks.c         |   47 +++++++++++++++++++++++++++++++++++++----------
 include/linux/fs.h |   13 +++++++++++++
 2 files changed, 50 insertions(+), 10 deletions(-)

diff -u --recursive --new-file linux-2.6.7-01-fix_locks/fs/locks.c linux-2.6.7-02-fix_locks2/fs/locks.c
--- linux-2.6.7-01-fix_locks/fs/locks.c	2004-06-29 17:32:20.000000000 -0400
+++ linux-2.6.7-02-fix_locks2/fs/locks.c	2004-06-29 23:14:05.000000000 -0400
@@ -167,6 +167,12 @@
 	if (!list_empty(&fl->fl_link))
 		panic("Attempting to free lock on active lock list");
 
+	if (fl->fl_ops && fl->fl_ops->fl_release_private) {
+		fl->fl_ops->fl_release_private(fl);
+		fl->fl_ops = NULL;
+	}
+	fl->fl_lmops = NULL;
+
 	kmem_cache_free(filelock_cache, fl);
 }
 
@@ -186,6 +192,8 @@
 	fl->fl_notify = NULL;
 	fl->fl_insert = NULL;
 	fl->fl_remove = NULL;
+	fl->fl_ops = NULL;
+	fl->fl_lmops = NULL;
 }
 
 EXPORT_SYMBOL(locks_init_lock);
@@ -220,7 +228,10 @@
 	new->fl_notify = fl->fl_notify;
 	new->fl_insert = fl->fl_insert;
 	new->fl_remove = fl->fl_remove;
-	new->fl_u = fl->fl_u;
+	new->fl_ops = fl->fl_ops;
+	new->fl_lmops = fl->fl_lmops;
+	if (fl->fl_ops && fl->fl_ops->fl_copy_lock)
+		fl->fl_ops->fl_copy_lock(new, fl);
 }
 
 EXPORT_SYMBOL(locks_copy_lock);
@@ -324,6 +335,8 @@
 	fl->fl_notify = NULL;
 	fl->fl_insert = NULL;
 	fl->fl_remove = NULL;
+	fl->fl_ops = NULL;
+	fl->fl_lmops = NULL;
 
 	return assign_type(fl, l->l_type);
 }
@@ -364,6 +377,8 @@
 	fl->fl_notify = NULL;
 	fl->fl_insert = NULL;
 	fl->fl_remove = NULL;
+	fl->fl_ops = NULL;
+	fl->fl_lmops = NULL;
 
 	switch (l->l_type) {
 	case F_RDLCK:
@@ -400,6 +415,8 @@
 	fl->fl_notify = NULL;
 	fl->fl_insert = NULL;
 	fl->fl_remove = NULL;
+	fl->fl_ops = NULL;
+	fl->fl_lmops = NULL;
 
 	*flp = fl;
 	return 0;
@@ -419,10 +436,9 @@
 static inline int
 posix_same_owner(struct file_lock *fl1, struct file_lock *fl2)
 {
-	/* FIXME: Replace this sort of thing with struct file_lock_operations */
-	if ((fl1->fl_type | fl2->fl_type) & FL_LOCKD)
-		return fl1->fl_owner == fl2->fl_owner &&
-			fl1->fl_pid == fl2->fl_pid;
+	if (fl1->fl_lmops && fl1->fl_lmops->fl_compare_owner)
+		return fl2->fl_lmops == fl1->fl_lmops &&
+			fl1->fl_lmops->fl_compare_owner(fl1, fl2);
 	return fl1->fl_owner == fl2->fl_owner;
 }
 
@@ -981,6 +997,8 @@
 		break;
 	}
 
+	if (fl.fl_ops && fl.fl_ops->fl_release_private)
+		fl.fl_ops->fl_release_private(&fl);
 	return error;
 }
 
@@ -1415,7 +1433,6 @@
 	error = -EFAULT;
 	if (!copy_to_user(l, &flock, sizeof(flock)))
 		error = 0;
-  
 out:
 	return error;
 }
@@ -1665,6 +1682,8 @@
 	lock.fl_owner = owner;
 	lock.fl_pid = current->tgid;
 	lock.fl_file = filp;
+	lock.fl_ops = NULL;
+	lock.fl_lmops = NULL;
 
 	if (filp->f_op && filp->f_op->lock != NULL) {
 		filp->f_op->lock(filp, F_SETLK, &lock);
@@ -1684,6 +1703,8 @@
 		before = &fl->fl_next;
 	}
 	unlock_kernel();
+	if (lock.fl_ops && lock.fl_ops->fl_release_private)
+		lock.fl_ops->fl_release_private(&lock);
 }
 
 EXPORT_SYMBOL(locks_remove_posix);
@@ -1978,12 +1999,18 @@
 static inline void __steal_locks(struct file *file, fl_owner_t from)
 {
 	struct inode *inode = file->f_dentry->d_inode;
-	struct file_lock *fl = inode->i_flock;
+	struct file_lock *fl;
 
-	while (fl) {
-		if (fl->fl_file == file && fl->fl_owner == from)
+restart:
+	for (fl = inode->i_flock; fl != NULL; fl = fl->fl_next) {
+		if (fl->fl_file == file && fl->fl_owner == from) {
+			if (fl->fl_ops && fl->fl_ops->fl_steal_locks) {
+				fl->fl_ops->fl_steal_locks(fl, from);
+				/* Some filesystems may just drop the lock */
+				goto restart;
+			}
 			fl->fl_owner = current->files;
-		fl = fl->fl_next;
+		}
 	}
 }
 
diff -u --recursive --new-file linux-2.6.7-01-fix_locks/include/linux/fs.h linux-2.6.7-02-fix_locks2/include/linux/fs.h
--- linux-2.6.7-01-fix_locks/include/linux/fs.h	2004-06-29 17:27:33.000000000 -0400
+++ linux-2.6.7-02-fix_locks2/include/linux/fs.h	2004-06-29 23:09:11.000000000 -0400
@@ -622,6 +622,17 @@
  */
 typedef struct files_struct *fl_owner_t;
 
+struct file_lock_operations {
+
+	void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
+	void (*fl_release_private)(struct file_lock *);
+	void (*fl_steal_locks)(struct file_lock *, fl_owner_t);
+};
+
+struct lock_manager_operations {
+	int (*fl_compare_owner)(struct file_lock *, struct file_lock *);
+};
+
 /* that will die - we need it for nfs_lock_info */
 #include <linux/nfs_fs_i.h>
 
@@ -645,6 +656,8 @@
 	struct fasync_struct *	fl_fasync; /* for lease break notifications */
 	unsigned long fl_break_time;	/* for nonblocking lease breaks */
 
+	struct file_lock_operations *fl_ops;	/* Callbacks for filesystems */
+	struct lock_manager_operations *fl_lmops;	/* Callbacks for lockmanagers */
 	union {
 		struct nfs_lock_info	nfs_fl;
 	} fl_u;