Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb8430a2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

locks: remove fl_copy_lock lock_manager operation 



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

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 51ee4b84

Documentation/filesystems/Locking

+0 −2
Original line number Original line Diff line number Diff line
@@ -322,7 +322,6 @@ fl_release_private: yes yes 
prototypes:

prototypes:

	int (*fl_compare_owner)(struct file_lock *, struct file_lock *);

	int (*fl_compare_owner)(struct file_lock *, struct file_lock *);

	void (*fl_notify)(struct file_lock *);  /* unblock callback */

	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_release_private)(struct file_lock *);

	void (*fl_break)(struct file_lock *); /* break_lease callback */

	void (*fl_break)(struct file_lock *); /* break_lease callback */
@@ -330,7 +329,6 @@ locking rules: 
			BKL	may block

			BKL	may block

fl_compare_owner:	yes	no

fl_compare_owner:	yes	no

fl_notify:		yes	no

fl_notify:		yes	no

fl_copy_lock:		yes	no

fl_release_private:	yes	yes

fl_release_private:	yes	yes

fl_break:		yes	no

fl_break:		yes	no

fs/locks.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -235,12 +235,9 @@ static void locks_copy_private(struct file_lock *new, struct file_lock *fl) 
			fl->fl_ops->fl_copy_lock(new, fl);

			fl->fl_ops->fl_copy_lock(new, fl);

		new->fl_ops = fl->fl_ops;

		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;

		new->fl_lmops = fl->fl_lmops;

}

}

}





/*

/*

 * Initialize a new lock from an existing file_lock structure.

 * Initialize a new lock from an existing file_lock structure.

include/linux/fs.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -1056,7 +1056,6 @@ struct lock_manager_operations { 
	int (*fl_compare_owner)(struct file_lock *, struct file_lock *);

	int (*fl_compare_owner)(struct file_lock *, struct file_lock *);

	void (*fl_notify)(struct file_lock *);	/* unblock callback */

	void (*fl_notify)(struct file_lock *);	/* unblock callback */

	int (*fl_grant)(struct file_lock *, struct file_lock *, int);

	int (*fl_grant)(struct file_lock *, struct file_lock *, int);

	void (*fl_copy_lock)(struct file_lock *, struct file_lock *);

	void (*fl_release_private)(struct file_lock *);

	void (*fl_release_private)(struct file_lock *);

	void (*fl_break)(struct file_lock *);

	void (*fl_break)(struct file_lock *);

	int (*fl_mylease)(struct file_lock *, struct file_lock *);

	int (*fl_mylease)(struct file_lock *, struct file_lock *);