Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f891a29f authored by Jeff Layton's avatar Jeff Layton Committed by Al Viro
Browse files

locks: drop the unused filp argument to posix_unblock_lock 



Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent da53be12

fs/lockd/svclock.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static int nlmsvc_unlink_block(struct nlm_block *block) 
	dprintk("lockd: unlinking block %p...\n", block);



	/* Remove block from list */

	status = posix_unblock_lock(block->b_file->f_file, &block->b_call->a_args.lock.fl);

	status = posix_unblock_lock(&block->b_call->a_args.lock.fl);

	nlmsvc_remove_block(block);

	return status;

}

fs/locks.c

+1 −3
Original line number Diff line number Diff line
@@ -2099,13 +2099,12 @@ void locks_remove_flock(struct file *filp) 


/**

 *	posix_unblock_lock - stop waiting for a file lock

 *      @filp:   how the file was opened

 *	@waiter: the lock which was waiting

 *

 *	lockd needs to block waiting for locks.

 */

int

posix_unblock_lock(struct file *filp, struct file_lock *waiter)

posix_unblock_lock(struct file_lock *waiter)

{

	int status = 0;
@@ -2117,7 +2116,6 @@ posix_unblock_lock(struct file *filp, struct file_lock *waiter) 
	unlock_flocks();

	return status;

}



EXPORT_SYMBOL(posix_unblock_lock);



/**

include/linux/fs.h

+2 −3
Original line number Diff line number Diff line
@@ -994,7 +994,7 @@ 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_file_wait(struct file *, struct file_lock *);

extern int posix_unblock_lock(struct file *, 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);
@@ -1084,8 +1084,7 @@ static inline int posix_lock_file_wait(struct file *filp, struct file_lock *fl) 
	return -ENOLCK;

}



static inline int posix_unblock_lock(struct file *filp,

				     struct file_lock *waiter)

static inline int posix_unblock_lock(struct file_lock *waiter)

{

	return -ENOENT;

}