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

Commit 78ed8a13 authored by Jeff Layton's avatar Jeff Layton
Browse files

locks: rename locks_remove_flock to locks_remove_file 



This function currently removes leases in addition to flock locks and in
a later patch we'll have it deal with file-private locks too. Rename it
to locks_remove_file to indicate that it removes locks that are
associated with a particular struct file, and not just flock locks.

Acked-by: default avatarJ. Bruce Fields <bfields@fieldses.org>
Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
parent bce7560d

fs/file_table.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static void __fput(struct file *file) 
	 * in the file cleanup chain.

	 */

	eventpoll_release(file);

	locks_remove_flock(file);

	locks_remove_file(file);



	if (unlikely(file->f_flags & FASYNC)) {

		if (file->f_op->fasync)

fs/locks.c

+1 −1
Original line number Diff line number Diff line
@@ -2196,7 +2196,7 @@ EXPORT_SYMBOL(locks_remove_posix); 
/*

 * This function is called on the last close of an open file.

 */

void locks_remove_flock(struct file *filp)

void locks_remove_file(struct file *filp)

{

	struct inode * inode = file_inode(filp);

	struct file_lock *fl;

include/linux/fs.h

+2 −2
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ extern struct file_lock * locks_alloc_lock(void); 
extern void locks_copy_lock(struct file_lock *, struct file_lock *);

extern void __locks_copy_lock(struct file_lock *, const struct file_lock *);

extern void locks_remove_posix(struct file *, fl_owner_t);

extern void locks_remove_flock(struct file *);

extern void locks_remove_file(struct file *);

extern void locks_release_private(struct file_lock *);

extern void posix_test_lock(struct file *, struct file_lock *);

extern int posix_lock_file(struct file *, struct file_lock *, struct file_lock *);
@@ -1083,7 +1083,7 @@ static inline void locks_remove_posix(struct file *filp, fl_owner_t owner) 
	return;

}



static inline void locks_remove_flock(struct file *filp)

static inline void locks_remove_file(struct file *filp)

{

	return;

}