Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
dlm: initialize file_lock struct in GETLK before copying conflicting lock
dlm: fix plock notify callback to lockd
+4
-2
fs/dlm/plock.c
+4
-2
fs/dlm/plock.c
···
168
168
notify = xop->callback;
169
169
170
170
if (op->info.rv) {
171
-
notify(flc, NULL, op->info.rv);
171
+
notify(fl, NULL, op->info.rv);
172
172
goto out;
173
173
}
174
174
···
187
187
(unsigned long long)op->info.number, file, fl);
188
188
}
189
189
190
-
rv = notify(flc, NULL, 0);
190
+
rv = notify(fl, NULL, 0);
191
191
if (rv) {
192
192
/* XXX: We need to cancel the fs lock here: */
193
193
log_print("dlm_plock_callback: lock granted after lock request "
···
304
304
if (rv == -ENOENT)
305
305
rv = 0;
306
306
else if (rv > 0) {
307
+
locks_init_lock(fl);
307
308
fl->fl_type = (op->info.ex) ? F_WRLCK : F_RDLCK;
309
+
fl->fl_flags = FL_POSIX;
308
310
fl->fl_pid = op->info.pid;
309
311
fl->fl_start = op->info.start;
310
312
fl->fl_end = op->info.end;