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

Documentation/filesystems/Locking +0 −2
fs/locks.c +1 −4
include/linux/fs.h +0 −1

Documentation/filesystems/Locking+0−2

@@ -322,7 +322,6 @@ fl_release_private: yes yes · 321 unmodified lines
322	322	prototypes:
323	323	int (fl_compare_owner)(struct file_lock , struct file_lock *);
324	324	void (fl_notify)(struct file_lock ); /* unblock callback */
325		− void (fl_copy_lock)(struct file_lock , struct file_lock *);
326	325	void (fl_release_private)(struct file_lock );
327	326	void (fl_break)(struct file_lock ); /* break_lease callback */
328	327
@@ -330,7 +329,6 @@ locking rules: · 1 unmodified line
330	329	BKL may block
331	330	fl_compare_owner: yes no
332	331	fl_notify: yes no
333		−fl_copy_lock: yes no
334	332	fl_release_private: yes yes
335	333	fl_break: yes no
336	334

fs/locks.c+1−4

@@ -235,11 +235,8 @@ static void locks_copy_private(struct file_lock new, struct file_lock fl) · 234 unmodified lines
235	235	fl->fl_ops->fl_copy_lock(new, fl);
236	236	new->fl_ops = fl->fl_ops;
237	237	}
238		− if (fl->fl_lmops) {
239		− if (fl->fl_lmops->fl_copy_lock)
240		− fl->fl_lmops->fl_copy_lock(new, fl);
	238	+ if (fl->fl_lmops)
241	239	new->fl_lmops = fl->fl_lmops;
242		− }
243	240	}
244	241
245	242	/*

include/linux/fs.h+0−1

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