diff options
-rw-r--r-- | fs/file_table.c | 2 | ||||
-rw-r--r-- | fs/locks.c | 2 | ||||
-rw-r--r-- | include/linux/fs.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/file_table.c b/fs/file_table.c index 5fff9030be34..468543c1973d 100644 --- a/fs/file_table.c +++ b/fs/file_table.c | |||
@@ -234,7 +234,7 @@ static void __fput(struct file *file) | |||
234 | * in the file cleanup chain. | 234 | * in the file cleanup chain. |
235 | */ | 235 | */ |
236 | eventpoll_release(file); | 236 | eventpoll_release(file); |
237 | locks_remove_flock(file); | 237 | locks_remove_file(file); |
238 | 238 | ||
239 | if (unlikely(file->f_flags & FASYNC)) { | 239 | if (unlikely(file->f_flags & FASYNC)) { |
240 | if (file->f_op->fasync) | 240 | if (file->f_op->fasync) |
diff --git a/fs/locks.c b/fs/locks.c index 4cd25781b0a4..4d4e790150e0 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
@@ -2196,7 +2196,7 @@ EXPORT_SYMBOL(locks_remove_posix); | |||
2196 | /* | 2196 | /* |
2197 | * This function is called on the last close of an open file. | 2197 | * This function is called on the last close of an open file. |
2198 | */ | 2198 | */ |
2199 | void locks_remove_flock(struct file *filp) | 2199 | void locks_remove_file(struct file *filp) |
2200 | { | 2200 | { |
2201 | struct inode * inode = file_inode(filp); | 2201 | struct inode * inode = file_inode(filp); |
2202 | struct file_lock *fl; | 2202 | struct file_lock *fl; |
diff --git a/include/linux/fs.h b/include/linux/fs.h index df8474408331..7527d96913d3 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -1012,7 +1012,7 @@ extern struct file_lock * locks_alloc_lock(void); | |||
1012 | extern void locks_copy_lock(struct file_lock *, struct file_lock *); | 1012 | extern void locks_copy_lock(struct file_lock *, struct file_lock *); |
1013 | extern void __locks_copy_lock(struct file_lock *, const struct file_lock *); | 1013 | extern void __locks_copy_lock(struct file_lock *, const struct file_lock *); |
1014 | extern void locks_remove_posix(struct file *, fl_owner_t); | 1014 | extern void locks_remove_posix(struct file *, fl_owner_t); |
1015 | extern void locks_remove_flock(struct file *); | 1015 | extern void locks_remove_file(struct file *); |
1016 | extern void locks_release_private(struct file_lock *); | 1016 | extern void locks_release_private(struct file_lock *); |
1017 | extern void posix_test_lock(struct file *, struct file_lock *); | 1017 | extern void posix_test_lock(struct file *, struct file_lock *); |
1018 | extern int posix_lock_file(struct file *, struct file_lock *, struct file_lock *); | 1018 | 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) | |||
1083 | return; | 1083 | return; |
1084 | } | 1084 | } |
1085 | 1085 | ||
1086 | static inline void locks_remove_flock(struct file *filp) | 1086 | static inline void locks_remove_file(struct file *filp) |
1087 | { | 1087 | { |
1088 | return; | 1088 | return; |
1089 | } | 1089 | } |