From: David Teigland <teigland@redhat.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org
Subject: [GIT PULL] dlm updates for 2.6.26
Date: Tue, 22 Apr 2008 08:51:16 -0500 [thread overview]
Message-ID: <20080422135116.GA14594@redhat.com> (raw)
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(-)
next reply other threads:[~2008-04-22 13:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-22 13:51 David Teigland [this message]
2008-04-22 20:46 ` [GIT PULL] dlm updates for 2.6.26 Linus Torvalds
2008-04-22 21:08 ` David Teigland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080422135116.GA14594@redhat.com \
--to=teigland@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox