diff --git a/[refs] b/[refs] index e4f8e818fef6..345dab07fa4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24179f488092267c9a033d7e25ce7a58af50ff79 +refs/heads/master: 20d5a39929232a715f29e6cb7e3f0d0c790f41eb diff --git a/trunk/fs/dlm/plock.c b/trunk/fs/dlm/plock.c index 502b1ea5ef6b..894a32d438d5 100644 --- a/trunk/fs/dlm/plock.c +++ b/trunk/fs/dlm/plock.c @@ -304,7 +304,9 @@ int dlm_posix_get(dlm_lockspace_t *lockspace, u64 number, struct file *file, if (rv == -ENOENT) rv = 0; else if (rv > 0) { + locks_init_lock(fl); fl->fl_type = (op->info.ex) ? F_WRLCK : F_RDLCK; + fl->fl_flags = FL_POSIX; fl->fl_pid = op->info.pid; fl->fl_start = op->info.start; fl->fl_end = op->info.end;