diff options
| author |   Mark Fasheh <mfasheh@suse.com> | 2008-07-10 09:25:39 -0700 |
|---|---|---|
| committer | Mark Fasheh <mfasheh@suse.com> | 2008-07-10 09:25:39 -0700 |
| commit | e988cf1cfed4ed80bf40528e655fe18bed6a38b6 (patch) | |
| tree | eeaf62bcf6e9f9b3154b70bf98e70881234f7ccc /include/linux/kernel.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband (diff) | |
| download | wireguard-linux-e988cf1cfed4ed80bf40528e655fe18bed6a38b6.tar.xz wireguard-linux-e988cf1cfed4ed80bf40528e655fe18bed6a38b6.zip | |
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>
Diffstat (limited to 'include/linux/kernel.h')
0 files changed, 0 insertions, 0 deletions