diff options
author | Benjamin Coddington <bcodding@redhat.com> | 2015-10-22 13:38:15 -0400 |
---|---|---|
committer | Jeff Layton <jeff.layton@primarydata.com> | 2015-10-22 14:57:42 -0400 |
commit | 616fb38fa7a9599293e05ae1fa9acfaf73922434 (patch) | |
tree | 468cc10d44736b22d843a87c31c8a306d9e605cd /fs/locks.c | |
parent | 4f6563677ae833baad8003e14353241bc25da4fc (diff) |
locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait
All callers use locks_lock_inode_wait() instead.
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
Diffstat (limited to 'fs/locks.c')
-rw-r--r-- | fs/locks.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fs/locks.c b/fs/locks.c index 4667f8226747..0d2b3267e2a3 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
@@ -1171,10 +1171,9 @@ EXPORT_SYMBOL(posix_lock_file); | |||
1171 | * @inode: inode of file to which lock request should be applied | 1171 | * @inode: inode of file to which lock request should be applied |
1172 | * @fl: The lock to be applied | 1172 | * @fl: The lock to be applied |
1173 | * | 1173 | * |
1174 | * Variant of posix_lock_file_wait that does not take a filp, and so can be | 1174 | * Apply a POSIX style lock request to an inode. |
1175 | * used after the filp has already been torn down. | ||
1176 | */ | 1175 | */ |
1177 | int posix_lock_inode_wait(struct inode *inode, struct file_lock *fl) | 1176 | static int posix_lock_inode_wait(struct inode *inode, struct file_lock *fl) |
1178 | { | 1177 | { |
1179 | int error; | 1178 | int error; |
1180 | might_sleep (); | 1179 | might_sleep (); |
@@ -1191,7 +1190,6 @@ int posix_lock_inode_wait(struct inode *inode, struct file_lock *fl) | |||
1191 | } | 1190 | } |
1192 | return error; | 1191 | return error; |
1193 | } | 1192 | } |
1194 | EXPORT_SYMBOL(posix_lock_inode_wait); | ||
1195 | 1193 | ||
1196 | /** | 1194 | /** |
1197 | * locks_mandatory_locked - Check for an active lock | 1195 | * locks_mandatory_locked - Check for an active lock |
@@ -1862,7 +1860,7 @@ int fcntl_setlease(unsigned int fd, struct file *filp, long arg) | |||
1862 | * | 1860 | * |
1863 | * Apply a FLOCK style lock request to an inode. | 1861 | * Apply a FLOCK style lock request to an inode. |
1864 | */ | 1862 | */ |
1865 | int flock_lock_inode_wait(struct inode *inode, struct file_lock *fl) | 1863 | static int flock_lock_inode_wait(struct inode *inode, struct file_lock *fl) |
1866 | { | 1864 | { |
1867 | int error; | 1865 | int error; |
1868 | might_sleep(); | 1866 | might_sleep(); |
@@ -1879,7 +1877,6 @@ int flock_lock_inode_wait(struct inode *inode, struct file_lock *fl) | |||
1879 | } | 1877 | } |
1880 | return error; | 1878 | return error; |
1881 | } | 1879 | } |
1882 | EXPORT_SYMBOL(flock_lock_inode_wait); | ||
1883 | 1880 | ||
1884 | /** | 1881 | /** |
1885 | * locks_lock_inode_wait - Apply a lock to an inode | 1882 | * locks_lock_inode_wait - Apply a lock to an inode |