[GIT PULL] dlm updates for 2.6.26

[GIT PULL] dlm updates for 2.6.26

[David Teigland]

Linus,

Please pull dlm updates for 2.6.26 from:

 git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git for-linus

They have been in linux-next and -mm for some time.  The only really notable
patch is the one that moves gfs2's posix lock handling into the dlm so that it
can be shared by both gfs2 and ocfs2.  The plock code isn't technically related
to the dlm, but it seems like a sensible common place for both gfs2 and ocfs2
to get to it.  It can also take advantage of the userspace cluster pieces
already in place for the dlm instead of replicating it.  The plock code was
never closely tied to gfs2 either, so the move required no functional changes.

Thanks,
Dave


Adrian Bunk (1):
      dlm: make dlm_print_rsb() static

David Teigland (4):
      dlm: save master info after failed no-queue request
      dlm: recover nodes that are removed and re-added
      dlm: move plock code from gfs2
      dlm: common max length definitions

Harvey Harrison (1):
      dlm: match signedness between dlm_config_info and cluster_set

Mike Frysinger (1):
      dlm: linux/{dlm,dlm_device}.h: cleanup for userspace


 fs/dlm/Makefile                |    1 +
 fs/dlm/config.c                |   50 ++++-
 fs/dlm/config.h                |    3 +-
 fs/dlm/dlm_internal.h          |    8 +-
 fs/dlm/lock.c                  |    5 +-
 fs/dlm/lock.h                  |    1 -
 fs/dlm/main.c                  |    7 +
 fs/dlm/member.c                |   34 +++-
 fs/dlm/plock.c                 |  439 ++++++++++++++++++++++++++++++++++++++++
 fs/dlm/recoverd.c              |    1 +
 fs/gfs2/locking/dlm/Makefile   |    2 +-
 fs/gfs2/locking/dlm/lock_dlm.h |   12 +-
 fs/gfs2/locking/dlm/main.c     |    8 -
 fs/gfs2/locking/dlm/mount.c    |   21 ++
 fs/gfs2/locking/dlm/plock.c    |  406 -------------------------------------
 include/linux/Kbuild           |    2 +-
 include/linux/dlm.h            |    7 +-
 include/linux/dlm_device.h     |   11 +-
 include/linux/dlm_plock.h      |   50 +++++
 include/linux/dlmconstants.h   |    4 +
 include/linux/lock_dlm_plock.h |   41 ----
 21 files changed, 614 insertions(+), 499 deletions(-)

Re: [GIT PULL] dlm updates for 2.6.26

[Linus Torvalds]

On Tue, 22 Apr 2008, David Teigland wrote:
> 
> Please pull dlm updates for 2.6.26 from:

Small detail: can you please use "--stat --summary -M" to generate the 
diffstat, because you had:

>  ...
>  21 files changed, 614 insertions(+), 499 deletions(-)

but what I then check against notices the rename, and becomes:

 ...
 20 files changed, 276 insertions(+), 161 deletions(-)
 rename fs/{gfs2/locking => }/dlm/plock.c (67%)
 create mode 100644 include/linux/dlm_plock.h
 delete mode 100644 include/linux/lock_dlm_plock.h

which I think is more accurate as to how big the changes were, as well as 
just more human-readable and informative.

(Apparently the naming changes in lock_dlm_plock.h -> dlm_plock.h makes it 
be effectively a rewrite, explaining why it's not two renames..)

		Linus

Re: [GIT PULL] dlm updates for 2.6.26

[David Teigland]

On Tue, Apr 22, 2008 at 01:46:54PM -0700, Linus Torvalds wrote:
> 
> 
> On Tue, 22 Apr 2008, David Teigland wrote:
> > 
> > Please pull dlm updates for 2.6.26 from:
> 
> Small detail: can you please use "--stat --summary -M" to generate the 
> diffstat, because you had:
> 
> >  ...
> >  21 files changed, 614 insertions(+), 499 deletions(-)
> 
> but what I then check against notices the rename, and becomes:
> 
>  ...
>  20 files changed, 276 insertions(+), 161 deletions(-)
>  rename fs/{gfs2/locking => }/dlm/plock.c (67%)
>  create mode 100644 include/linux/dlm_plock.h
>  delete mode 100644 include/linux/lock_dlm_plock.h
> 
> which I think is more accurate as to how big the changes were, as well as 
> just more human-readable and informative.
> 
> (Apparently the naming changes in lock_dlm_plock.h -> dlm_plock.h makes it 
> be effectively a rewrite, explaining why it's not two renames..)

Yep, will do.  Nice diffstat for the record,

 fs/dlm/Makefile                   |    1 +
 fs/dlm/config.c                   |   50 +++++++++--
 fs/dlm/config.h                   |    3 +-
 fs/dlm/dlm_internal.h             |    8 +-
 fs/dlm/lock.c                     |    5 +-
 fs/dlm/lock.h                     |    1 -
 fs/dlm/main.c                     |    7 ++
 fs/dlm/member.c                   |   34 +++++++-
 fs/{gfs2/locking => }/dlm/plock.c |  169 ++++++++++++++++++++++---------------
 fs/dlm/recoverd.c                 |    1 +
 fs/gfs2/locking/dlm/Makefile      |    2 +-
 fs/gfs2/locking/dlm/lock_dlm.h    |   12 +---
 fs/gfs2/locking/dlm/main.c        |    8 --
 fs/gfs2/locking/dlm/mount.c       |   21 +++++
 include/linux/Kbuild              |    2 +-
 include/linux/dlm.h               |    7 +-
 include/linux/dlm_device.h        |   11 ++-
 include/linux/dlm_plock.h         |   50 +++++++++++
 include/linux/dlmconstants.h      |    4 +
 include/linux/lock_dlm_plock.h    |   41 ---------
 20 files changed, 276 insertions(+), 161 deletions(-)
 rename fs/{gfs2/locking => }/dlm/plock.c (67%)
 create mode 100644 include/linux/dlm_plock.h
 delete mode 100644 include/linux/lock_dlm_plock.h