lkml.org 
[lkml]   [2008]   [Apr]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] Export __locks_copy_lock() so modular lockd builds
From
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)
> {


\
 
 \ /
  Last update: 2008-04-26 01:07    [W:0.028 / U:0.768 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site