Commit 616fb38f authored by Benjamin Coddington's avatar Benjamin Coddington Committed by Jeff Layton
Browse files

locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait 



All callers use locks_lock_inode_wait() instead.

Signed-off-by: default avatarBenjamin Coddington <bcodding@redhat.com>
Signed-off-by: default avatarJeff Layton <jeff.layton@primarydata.com>
parent 4f656367

fs/locks.c

+3 −6
Original line number Diff line number Diff line
@@ -1171,10 +1171,9 @@ EXPORT_SYMBOL(posix_lock_file); 
 * @inode: inode of file to which lock request should be applied

 * @fl: The lock to be applied

 *

 * Variant of posix_lock_file_wait that does not take a filp, and so can be

 * used after the filp has already been torn down.

 * Apply a POSIX style lock request to an inode.

 */

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;

	might_sleep ();
@@ -1191,7 +1190,6 @@ int posix_lock_inode_wait(struct inode *inode, struct file_lock *fl) 
	}

	return error;

}

EXPORT_SYMBOL(posix_lock_inode_wait);



/**

 * 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.

 */

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;

	might_sleep();
@@ -1879,7 +1877,6 @@ int flock_lock_inode_wait(struct inode *inode, struct file_lock *fl) 
	}

	return error;

}

EXPORT_SYMBOL(flock_lock_inode_wait);



/**

 * locks_lock_inode_wait - Apply a lock to an inode

include/linux/fs.h

+0 −24
Original line number Diff line number Diff line
@@ -1053,12 +1053,10 @@ 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 *);

extern int posix_lock_inode_wait(struct inode *, struct file_lock *);

extern int posix_unblock_lock(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_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 __break_lease(struct inode *inode, unsigned int flags, unsigned int type);

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;

}



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)

{

	return -ENOENT;
@@ -1172,12 +1164,6 @@ static inline int vfs_cancel_lock(struct file *filp, struct file_lock *fl) 
	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)

{

	return -ENOLCK;
@@ -1221,16 +1207,6 @@ static inline struct inode *file_inode(const struct file *f) 
	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)

{

	return locks_lock_inode_wait(file_inode(filp), fl);