Commit 3dd7b71c authored by Roland Dreier's avatar Roland Dreier Committed by Linus Torvalds
Browse files

Export __locks_copy_lock() so modular lockd builds

Commit 1a747ee0

 ("locks: don't call ->copy_lock methods on return of
conflicting locks") changed fs/lockd/svclock.c to call
__locks_copy_lock() instead of locks_copy_lock(), but lockd can be built
as a module and __locks_copy_lock() is not exported, which causes a
build error

    ERROR: "__locks_copy_lock" [fs/lockd/lockd.ko] undefined!


Fix this by exporting __locks_copy_lock().
Signed-off-by: default avatarRoland Dreier <>
Signed-off-by: default avatarLinus Torvalds <>
parent b9fa38f7
......@@ -236,6 +236,7 @@ void __locks_copy_lock(struct file_lock *new, const struct file_lock *fl)
new->fl_ops = NULL;
new->fl_lmops = NULL;
void locks_copy_lock(struct file_lock *new, struct file_lock *fl)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment