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

Commit f9f48ec7 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by Al Viro
Browse files

[patch 4/4] flock: remove unused fields from file_lock_operations 



fl_insert and fl_remove are not used right now in the kernel. Remove them.

Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 694a1764

fs/locks.c

+0 −6
Original line number Diff line number Diff line
@@ -561,9 +561,6 @@ static void locks_insert_lock(struct file_lock **pos, struct file_lock *fl) 
	/* insert into file's list */

	fl->fl_next = *pos;

	*pos = fl;



	if (fl->fl_ops && fl->fl_ops->fl_insert)

		fl->fl_ops->fl_insert(fl);

}



/*
@@ -586,9 +583,6 @@ static void locks_delete_lock(struct file_lock **thisfl_p) 
		fl->fl_fasync = NULL;

	}



	if (fl->fl_ops && fl->fl_ops->fl_remove)

		fl->fl_ops->fl_remove(fl);



	if (fl->fl_nspid) {

		put_pid(fl->fl_nspid);

		fl->fl_nspid = NULL;

include/linux/fs.h

+0 −2
Original line number Diff line number Diff line
@@ -894,8 +894,6 @@ static inline int file_check_writeable(struct file *filp) 
typedef struct files_struct *fl_owner_t;



struct file_lock_operations {

	void (*fl_insert)(struct file_lock *);	/* lock insertion callback */

	void (*fl_remove)(struct file_lock *);	/* lock removal callback */

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

	void (*fl_release_private)(struct file_lock *);

};