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: J. Bruce Fields <bfields@fieldses.org> Signed-off-by: Jeff Layton <jlayton@redhat.com>
This commit is contained in:
Родитель
bce7560d49
Коммит
78ed8a1338
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче