]> err.no Git - linux-2.6/commit
ocfs2: Fix flags in ocfs2_file_lock
authorMark Fasheh <mfasheh@suse.com>
Thu, 10 Jul 2008 16:25:39 +0000 (09:25 -0700)
committerMark Fasheh <mfasheh@suse.com>
Thu, 10 Jul 2008 16:25:39 +0000 (09:25 -0700)
commite988cf1cfed4ed80bf40528e655fe18bed6a38b6
treeeeaf62bcf6e9f9b3154b70bf98e70881234f7ccc
parent6329d3021bcfa9038621e6e917d98929421d8ec8
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 <mfasheh@suse.com>
fs/ocfs2/dlmglue.c