[GIT PULL] dlm fixes for 2.6.29-rc2

David Teigland
2009-01-23T19:57:31Z

Linus,

Please pull two dlm fixes for 2.6.29-rc2 from:

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

They both fix bugs with nfs posix locks on gfs2/ocfs2. The first is triggered
by a posix lock that overlaps another, the second is triggered by any GETLK,
so both are pretty common.
Thanks,
Dave

David Teigland (1):
dlm: fix plock notify callback to lockd

Jeff Layton (1):
dlm: initialize file_lock struct in GETLK before copying conflicting lock

fs/dlm/plock.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)