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

Commit b0904e14 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] fs/locks.c: make posix_locks_deadlock() static 



We can now make posix_locks_deadlock() static.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 75e1fcc0

fs/locks.c

+1 −3
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ EXPORT_SYMBOL(posix_test_lock); 
 * from a broken NFS client. But broken NFS clients have a lot more to

 * worry about than proper deadlock detection anyway... --okir

 */

int posix_locks_deadlock(struct file_lock *caller_fl,

static int posix_locks_deadlock(struct file_lock *caller_fl,

				struct file_lock *block_fl)

{

	struct list_head *tmp;
@@ -722,8 +722,6 @@ int posix_locks_deadlock(struct file_lock *caller_fl, 
	return 0;

}



EXPORT_SYMBOL(posix_locks_deadlock);



/* Try to create a FLOCK lock on filp. We always insert new FLOCK locks

 * at the head of the list, but that's secret knowledge known only to

 * flock_lock_file and posix_lock_file.

include/linux/fs.h

+0 −1
Original line number Diff line number Diff line
@@ -776,7 +776,6 @@ extern int posix_lock_file_conf(struct file *, struct file_lock *, struct file_l 
extern int posix_lock_file(struct file *, 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_locks_deadlock(struct file_lock *, struct file_lock *);

extern int flock_lock_file_wait(struct file *filp, struct file_lock *fl);

extern int __break_lease(struct inode *inode, unsigned int flags);

extern void lease_get_mtime(struct inode *, struct timespec *time);