From: Roland Dreier <rdreier@cisco.com>
Date: Fri, 25 Apr 2008 22:32:51 +0000 (-0700)
Subject: Export __locks_copy_lock() so modular lockd builds
X-Git-Tag: v2.6.26-rc1~1054
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=3dd7b71ca0f7ff8410a6b8cb15e5f670f90181e4;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/fs/locks.c b/fs/locks.c
index e1ea2fe0368..44d9a6a7ec5 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)
 {