* [PATCH] Export __locks_copy_lock() so modular lockd builds
@ 2008-04-25 22:32 Roland Dreier
2008-04-25 23:03 ` J. Bruce Fields
0 siblings, 1 reply; 2+ messages in thread
From: Roland Dreier @ 2008-04-25 22:32 UTC (permalink / raw)
To: torvalds, akpm; +Cc: linux-kernel, bfields, Trond.Myklebust
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>
---
fs/locks.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/fs/locks.c b/fs/locks.c
index e1ea2fe..44d9a6a 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)
new->fl_ops = NULL;
new->fl_lmops = NULL;
}
+EXPORT_SYMBOL(__locks_copy_lock);
void locks_copy_lock(struct file_lock *new, struct file_lock *fl)
{
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Export __locks_copy_lock() so modular lockd builds
2008-04-25 22:32 [PATCH] Export __locks_copy_lock() so modular lockd builds Roland Dreier
@ 2008-04-25 23:03 ` J. Bruce Fields
0 siblings, 0 replies; 2+ messages in thread
From: J. Bruce Fields @ 2008-04-25 23:03 UTC (permalink / raw)
To: Roland Dreier; +Cc: torvalds, akpm, linux-kernel, Trond.Myklebust
On Fri, Apr 25, 2008 at 03:32:51PM -0700, Roland Dreier wrote:
> 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().
Oog, sorry. Thaks for the fix!
>
> Signed-off-by: Roland Dreier <rolandd@cisco.com>
Acked-by: J. Bruce Fields <bfields@citi.umich.edu>
> ---
> fs/locks.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/fs/locks.c b/fs/locks.c
> index e1ea2fe..44d9a6a 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)
> new->fl_ops = NULL;
> new->fl_lmops = NULL;
> }
> +EXPORT_SYMBOL(__locks_copy_lock);
>
> void locks_copy_lock(struct file_lock *new, struct file_lock *fl)
> {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-04-25 23:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-25 22:32 [PATCH] Export __locks_copy_lock() so modular lockd builds Roland Dreier
2008-04-25 23:03 ` J. Bruce Fields
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.