diff options
author | Roland Dreier <rdreier@cisco.com> | 2008-04-25 18:32:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 18:49:46 -0400 |
commit | 3dd7b71ca0f7ff8410a6b8cb15e5f670f90181e4 (patch) | |
tree | 163e064bdd9036ae60c8998357d0c471f087699b /fs | |
parent | b9fa38f75ea7e1f64bc29653ca9758303ce698e4 (diff) |
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!
with CONFIG_LOCKD=m.
Fix this by exporting __locks_copy_lock().
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/locks.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/locks.c b/fs/locks.c index e1ea2fe03681..44d9a6a7ec50 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
@@ -236,6 +236,7 @@ void __locks_copy_lock(struct file_lock *new, const struct file_lock *fl) | |||
236 | new->fl_ops = NULL; | 236 | new->fl_ops = NULL; |
237 | new->fl_lmops = NULL; | 237 | new->fl_lmops = NULL; |
238 | } | 238 | } |
239 | EXPORT_SYMBOL(__locks_copy_lock); | ||
239 | 240 | ||
240 | void locks_copy_lock(struct file_lock *new, struct file_lock *fl) | 241 | void locks_copy_lock(struct file_lock *new, struct file_lock *fl) |
241 | { | 242 | { |