diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-12-30 16:51:43 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-12-30 16:51:43 -0500 |
| commit | 08cc36cbd1ee7d86422713bb21551eed1326b894 (patch) | |
| tree | 52cc683387f903b34a7f6f798dcdbae385b58db8 /fs/lockd/svc.c | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
| parent | 46f72f57d279688c4524df78edb5738db730eeef (diff) | |
Merge branch 'devel' into next
Diffstat (limited to 'fs/lockd/svc.c')
| -rw-r--r-- | fs/lockd/svc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 56b076736b56..252d80163d02 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | static struct svc_program nlmsvc_program; | 45 | static struct svc_program nlmsvc_program; |
| 46 | 46 | ||
| 47 | struct nlmsvc_binding * nlmsvc_ops; | 47 | struct nlmsvc_binding * nlmsvc_ops; |
| 48 | EXPORT_SYMBOL(nlmsvc_ops); | 48 | EXPORT_SYMBOL_GPL(nlmsvc_ops); |
| 49 | 49 | ||
| 50 | static DEFINE_MUTEX(nlmsvc_mutex); | 50 | static DEFINE_MUTEX(nlmsvc_mutex); |
| 51 | static unsigned int nlmsvc_users; | 51 | static unsigned int nlmsvc_users; |
| @@ -300,7 +300,7 @@ out: | |||
| 300 | mutex_unlock(&nlmsvc_mutex); | 300 | mutex_unlock(&nlmsvc_mutex); |
| 301 | return error; | 301 | return error; |
| 302 | } | 302 | } |
| 303 | EXPORT_SYMBOL(lockd_up); | 303 | EXPORT_SYMBOL_GPL(lockd_up); |
| 304 | 304 | ||
| 305 | /* | 305 | /* |
| 306 | * Decrement the user count and bring down lockd if we're the last. | 306 | * Decrement the user count and bring down lockd if we're the last. |
| @@ -329,7 +329,7 @@ lockd_down(void) | |||
| 329 | out: | 329 | out: |
| 330 | mutex_unlock(&nlmsvc_mutex); | 330 | mutex_unlock(&nlmsvc_mutex); |
| 331 | } | 331 | } |
| 332 | EXPORT_SYMBOL(lockd_down); | 332 | EXPORT_SYMBOL_GPL(lockd_down); |
| 333 | 333 | ||
| 334 | #ifdef CONFIG_SYSCTL | 334 | #ifdef CONFIG_SYSCTL |
| 335 | 335 | ||