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

Commit 068535f1 authored Aug 01, 2012 by J. Bruce Fields Committed by Linus Torvalds Aug 01, 2012

locks: remove unused lm_release_private



In commit 3b6e2723 ("locks: prevent side-effects of
locks_release_private before file_lock is initialized") we removed the
last user of lm_release_private without removing the field itself.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 2d534926

Documentation/filesystems/Locking

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -359,7 +359,6 @@ prototypes:
	int (lm_compare_owner)(struct file_lock , struct file_lock *);		int (lm_compare_owner)(struct file_lock , struct file_lock *);
	void (lm_notify)(struct file_lock ); /* unblock callback */		void (lm_notify)(struct file_lock ); /* unblock callback */
	int (lm_grant)(struct file_lock , struct file_lock *, int);		int (lm_grant)(struct file_lock , struct file_lock *, int);
	void (lm_release_private)(struct file_lock );
	void (lm_break)(struct file_lock ); /* break_lease callback */		void (lm_break)(struct file_lock ); /* break_lease callback */
	int (lm_change)(struct file_lock *, int);		int (lm_change)(struct file_lock *, int);

	@@ -368,7 +367,6 @@ locking rules:
	lm_compare_owner: yes no		lm_compare_owner: yes no
	lm_notify: yes no		lm_notify: yes no
	lm_grant: no no		lm_grant: no no
	lm_release_private: maybe no
	lm_break: yes no		lm_break: yes no
	lm_change yes no		lm_change yes no

fs/locks.c

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -200,11 +200,7 @@ void locks_release_private(struct file_lock *fl)
	fl->fl_ops->fl_release_private(fl);		fl->fl_ops->fl_release_private(fl);
	fl->fl_ops = NULL;		fl->fl_ops = NULL;
	}		}
	if (fl->fl_lmops) {
	if (fl->fl_lmops->lm_release_private)
	fl->fl_lmops->lm_release_private(fl);
	fl->fl_lmops = NULL;		fl->fl_lmops = NULL;
	}

	}		}
	EXPORT_SYMBOL_GPL(locks_release_private);		EXPORT_SYMBOL_GPL(locks_release_private);

include/linux/fs.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1162,7 +1162,6 @@ struct lock_manager_operations {
	int (lm_compare_owner)(struct file_lock , struct file_lock *);		int (lm_compare_owner)(struct file_lock , struct file_lock *);
	void (lm_notify)(struct file_lock ); /* unblock callback */		void (lm_notify)(struct file_lock ); /* unblock callback */
	int (lm_grant)(struct file_lock , struct file_lock *, int);		int (lm_grant)(struct file_lock , struct file_lock *, int);
	void (lm_release_private)(struct file_lock );
	void (lm_break)(struct file_lock );		void (lm_break)(struct file_lock );
	int (lm_change)(struct file_lock *, int);		int (lm_change)(struct file_lock *, int);
	};		};