[Cluster-devel] Re: [2.6 patch] proper extern for gfs2/locking/dlm/mount.c:gdlm_ops

[Steven Whitehouse <swhiteho@redhat.com>]

Hi,

Now in the GFS2 -nmw git tree. Thanks,

Steve.

On Sun, 2008-02-17 at 10:20 +0200, Adrian Bunk wrote:
> This patch adds a proper extern declaration for gdlm_ops in 
> fs/gfs2/locking/dlm/lock_dlm.h
> 
> Signed-off-by: Adrian Bunk <bunk@kernel.org>
> 
> ---
> 
>  fs/gfs2/locking/dlm/lock_dlm.h |    5 +++++
>  fs/gfs2/locking/dlm/main.c     |    2 --
>  fs/gfs2/locking/dlm/sysfs.c    |    2 --
>  3 files changed, 5 insertions(+), 4 deletions(-)
> 
> b4ac811ad577cd6039fdd1395cfa910294b8efdc diff --git a/fs/gfs2/locking/dlm/lock_dlm.h b/fs/gfs2/locking/dlm/lock_dlm.h
> index 9e8265d..58fcf8c 100644
> --- a/fs/gfs2/locking/dlm/lock_dlm.h
> +++ b/fs/gfs2/locking/dlm/lock_dlm.h
> @@ -183,5 +183,10 @@ int gdlm_plock_get(void *, struct lm_lockname *, struct file *,
>  		struct file_lock *);
>  int gdlm_punlock(void *, struct lm_lockname *, struct file *,
>  		struct file_lock *);
> +
> +/* mount.c */
> +
> +extern const struct lm_lockops gdlm_ops;
> +
>  #endif
>  
> diff --git a/fs/gfs2/locking/dlm/main.c b/fs/gfs2/locking/dlm/main.c
> index a0e7eda..36a2258 100644
> --- a/fs/gfs2/locking/dlm/main.c
> +++ b/fs/gfs2/locking/dlm/main.c
> @@ -11,8 +11,6 @@
>  
>  #include "lock_dlm.h"
>  
> -extern struct lm_lockops gdlm_ops;
> -
>  static int __init init_lock_dlm(void)
>  {
>  	int error;
> diff --git a/fs/gfs2/locking/dlm/sysfs.c b/fs/gfs2/locking/dlm/sysfs.c
> index a87b098..8479da4 100644
> --- a/fs/gfs2/locking/dlm/sysfs.c
> +++ b/fs/gfs2/locking/dlm/sysfs.c
> @@ -12,8 +12,6 @@
>  
>  #include "lock_dlm.h"
>  
> -extern struct lm_lockops gdlm_ops;
> -
>  static ssize_t proto_name_show(struct gdlm_ls *ls, char *buf)
>  {
>  	return sprintf(buf, "%s\n", gdlm_ops.lm_proto_name);
>