locks: remove fl_copy_lock lock_manager operation

This one was only used for a nasty hack in nfsd, which has recently been removed.

Christoph Hellwig committed 16 years ago

Commit bb8430a1 parent 51ee4b83 files · +1 −7Browse files

Unified · Split

3 files

 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 */
 			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

 			fl->fl_ops->fl_copy_lock(new, fl);
 		new->fl_ops = fl->fl_ops;
 	}
-	if (fl->fl_lmops) {
+	if (fl->fl_lmops)
-		if (fl->fl_lmops->fl_copy_lock)
-			fl->fl_lmops->fl_copy_lock(new, fl);
 		new->fl_lmops = fl->fl_lmops;
-	}
 }
 /*

@@ -1056,7 +1056,6 @@ struct lock_manager_operations { · 1055 unmodified lines
1056	int (fl_compare_owner)(struct file_lock , struct file_lock *);	1056	int (fl_compare_owner)(struct file_lock , struct file_lock *);
1057	void (fl_notify)(struct file_lock ); /* unblock callback */	1057	void (fl_notify)(struct file_lock ); /* unblock callback */
1058	int (fl_grant)(struct file_lock , struct file_lock *, int);	1058	int (fl_grant)(struct file_lock , struct file_lock *, int);
1059	void (fl_copy_lock)(struct file_lock , struct file_lock *);
1060	void (fl_release_private)(struct file_lock );	1059	void (fl_release_private)(struct file_lock );
1061	void (fl_break)(struct file_lock );	1060	void (fl_break)(struct file_lock );
1062	int (fl_mylease)(struct file_lock , struct file_lock *);	1061	int (fl_mylease)(struct file_lock , struct file_lock *);

Keyboard shortcuts