evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait

Browse source 
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>
This commit is contained in:
Benjamin Coddington 2015-10-22 13:38:15 -04:00 • committed by Jeff Layton
parent 4f6563677a
commit 616fb38fa7
2 changed files with 3 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fs/locks.c
View file

@ -1171,10 +1171,9 @@ EXPORT_SYMBOL(posix_lock_file);
* @inode: inode of file to which lock request should be applied * @inode: inode of file to which lock request should be applied
* @fl: The lock to be applied * @fl: The lock to be applied
* *
* Variant of posix_lock_file_wait that does not take a filp, and so can be * Apply a POSIX style lock request to an inode.
* used after the filp has already been torn down.
*/ */
int posix_lock_inode_wait(struct inode *inode, struct file_lock *fl) static int posix_lock_inode_wait(struct inode *inode, struct file_lock *fl)
{ {
int error; int error;
might_sleep (); might_sleep ();
@ -1191,7 +1190,6 @@ int posix_lock_inode_wait(struct inode *inode, struct file_lock *fl)
} }
return error; return error;
} }
EXPORT_SYMBOL(posix_lock_inode_wait);
/** /**
* locks_mandatory_locked - Check for an active lock * locks_mandatory_locked - Check for an active lock
@ -1862,7 +1860,7 @@ int fcntl_setlease(unsigned int fd, struct file *filp, long arg)
* *
* Apply a FLOCK style lock request to an inode. * Apply a FLOCK style lock request to an inode.
*/ */
int flock_lock_inode_wait(struct inode *inode, struct file_lock *fl) static int flock_lock_inode_wait(struct inode *inode, struct file_lock *fl)
{ {
int error; int error;
might_sleep(); might_sleep();
@ -1879,7 +1877,6 @@ int flock_lock_inode_wait(struct inode *inode, struct file_lock *fl)
} }
return error; return error;
} }
EXPORT_SYMBOL(flock_lock_inode_wait);
/** /**
* locks_lock_inode_wait - Apply a lock to an inode * locks_lock_inode_wait - Apply a lock to an inode

24
include/linux/fs.h
View file

@ -1053,12 +1053,10 @@ extern void locks_remove_file(struct file *);
extern void locks_release_private(struct file_lock *); extern void locks_release_private(struct file_lock *);
extern void posix_test_lock(struct file *, 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 *); extern int posix_lock_file(struct file *, struct file_lock *, struct file_lock *);
extern int posix_lock_inode_wait(struct inode *, struct file_lock *);
extern int posix_unblock_lock(struct file_lock *); extern int posix_unblock_lock(struct file_lock *);
extern int vfs_test_lock(struct file *, struct file_lock *); extern int vfs_test_lock(struct file *, struct file_lock *);
extern int vfs_lock_file(struct file *, unsigned int, struct file_lock *, struct file_lock *); extern int vfs_lock_file(struct file *, unsigned int, struct file_lock *, struct file_lock *);
extern int vfs_cancel_lock(struct file *filp, struct file_lock *fl); extern int vfs_cancel_lock(struct file *filp, struct file_lock *fl);
extern int flock_lock_inode_wait(struct inode *inode, struct file_lock *fl);
extern int locks_lock_inode_wait(struct inode *inode, struct file_lock *fl); extern int locks_lock_inode_wait(struct inode *inode, struct file_lock *fl);
extern int __break_lease(struct inode *inode, unsigned int flags, unsigned int type); extern int __break_lease(struct inode *inode, unsigned int flags, unsigned int type);
extern void lease_get_mtime(struct inode *, struct timespec *time); extern void lease_get_mtime(struct inode *, struct timespec *time);
@ -1145,12 +1143,6 @@ static inline int posix_lock_file(struct file *filp, struct file_lock *fl,
return -ENOLCK; return -ENOLCK;
} }
static inline int posix_lock_inode_wait(struct inode *inode,
struct file_lock *fl)
{
return -ENOLCK;
}
static inline int posix_unblock_lock(struct file_lock *waiter) static inline int posix_unblock_lock(struct file_lock *waiter)
{ {
return -ENOENT; return -ENOENT;
@ -1172,12 +1164,6 @@ static inline int vfs_cancel_lock(struct file *filp, struct file_lock *fl)
return 0; return 0;
} }
static inline int flock_lock_inode_wait(struct inode *inode,
struct file_lock *request)
{
return -ENOLCK;
}
static inline int locks_lock_inode_wait(struct inode *inode, struct file_lock *fl) static inline int locks_lock_inode_wait(struct inode *inode, struct file_lock *fl)
{ {
return -ENOLCK; return -ENOLCK;
@ -1221,16 +1207,6 @@ static inline struct inode *file_inode(const struct file *f)
return f->f_inode; return f->f_inode;
} }
static inline int posix_lock_file_wait(struct file *filp, struct file_lock *fl)
{
return posix_lock_inode_wait(file_inode(filp), fl);
}
static inline int flock_lock_file_wait(struct file *filp, struct file_lock *fl)
{
return flock_lock_inode_wait(file_inode(filp), fl);
}
static inline int locks_lock_file_wait(struct file *filp, struct file_lock *fl) static inline int locks_lock_file_wait(struct file *filp, struct file_lock *fl)
{ {
return locks_lock_inode_wait(file_inode(filp), fl); return locks_lock_inode_wait(file_inode(filp), fl);