[Cluster-devel] [PATCH 5/5] gfs2: dlm based recovery coordination

[Steven Whitehouse <swhiteho@redhat.com>]

Hi,

On Fri, 2011-12-16 at 16:03 -0600, David Teigland wrote:
> This new method of managing recovery is an alternative to
> the previous approach of using the userland gfs_controld.
> 
> - use dlm slot numbers to assign journal id's
> - use dlm recovery callbacks to initiate journal recovery
> - use a dlm lock to determine the first node to mount fs
> - use a dlm lock to track journals that need recovery
> 
> Signed-off-by: David Teigland <teigland@redhat.com>
> ---
>  fs/gfs2/glock.c             |    2 +-
>  fs/gfs2/glock.h             |    7 +-
>  fs/gfs2/incore.h            |   51 ++-
>  fs/gfs2/lock_dlm.c          |  979 ++++++++++++++++++++++++++++++++++++++++++-
>  fs/gfs2/main.c              |   10 +
>  fs/gfs2/ops_fstype.c        |   29 +-
>  fs/gfs2/recovery.c          |    4 +
>  fs/gfs2/sys.c               |   29 +-
>  fs/gfs2/sys.h               |    2 +
>  include/linux/gfs2_ondisk.h |    2 +
>  10 files changed, 1075 insertions(+), 40 deletions(-)
[snip]
> diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c
> index 20f63b0..bacb7af 100644
> --- a/fs/gfs2/lock_dlm.c
> +++ b/fs/gfs2/lock_dlm.c
> @@ -1,6 +1,6 @@
>  /*
>   * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
> - * Copyright (C) 2004-2009 Red Hat, Inc.  All rights reserved.
> + * Copyright (C) 2004-2011 Red Hat, Inc.  All rights reserved.
>   *
>   * This copyrighted material is made available to anyone wishing to use,
>   * modify, copy, or redistribute it subject to the terms and conditions
> @@ -11,12 +11,16 @@
>  #include <linux/dlm.h>
>  #include <linux/slab.h>
>  #include <linux/types.h>
> +#include <linux/delay.h>
> +#include <linux/gfs2_ondisk.h>
>  #include <linux/gfs2_ondisk.h>
>  
Also, just spotted that we only need one copy of gfs2_ondisk.h

Steve.