From: Mark Fasheh Date: Thu, 10 Jul 2008 16:25:39 +0000 (-0700) Subject: ocfs2: Fix flags in ocfs2_file_lock X-Git-Tag: v2.6.26~28^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e988cf1cfed4ed80bf40528e655fe18bed6a38b6;p=pandora-kernel.git ocfs2: Fix flags in ocfs2_file_lock The stack-glue merge changed the way we use flags in dlmglue in that we now use the fs/dlm equivalents. Unfortunately, a merge error left the new flock code only partially updated. This took a while to show up though, because the lock level constants are actually identical between o2dlm and fs/dlm. The *_CONVERT and *_NOQUEUE flags have different values though, which is eventually causing a crash in flags_to_o2dlm(). Signed-off-by: Mark Fasheh --- Reading git-diff-tree failed