2008-08-13 19:10:55

by David Teigland

[permalink] [raw]
Subject: [GIT PULL] dlm fixes for 2.6.27-rc3

Linus,

Please pull two simple dlm fixes from:

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

Thanks,
Dave

fs/dlm/config.c | 203 +++++++++++++++++++++++++++++--------------------------
fs/dlm/user.c | 10 ++-
2 files changed, 114 insertions(+), 99 deletions(-)


commit 51409340d240dabe66adb49f645588c3a802d055
Author: David Teigland <[email protected]>
Date: Thu Jul 31 09:31:53 2008 -0500

dlm: rename structs

Add a dlm_ prefix to the struct names in config.c. This resolves a
conflict with struct node in particular, when include/linux/node.h
happens to be included.

Reported-by: Andrew Morton <[email protected]>
Signed-off-by: David Teigland <[email protected]>

commit cb980d9a3ec3d39e30e0a4c473df528c09e0dcf3
Author: David Teigland <[email protected]>
Date: Tue Jul 29 15:21:19 2008 -0500

dlm: add missing kfrees

A couple of unlikely error conditions were missing a kfree on the error
exit path.

Reported-by: Juha Leppanen <[email protected]>
Signed-off-by: David Teigland <[email protected]>