---

yaml --- r: 130103 b: refs/heads/master c: 20d5a39 h: refs/heads/master i: 130101: 597296e 130099: 852214f 130095: bdefd95 v: v3
git-mirror · Jan 21, 2009 · e785a21 · e785a21
1 parent 68886c5
commit e785a21
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;