Skip to content

Commit 135143b

Browse files
committed
Merge tag 'locks-v4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux
Pull file locking bugfix from Jeff Layton: "This is a one-line fix for a bug that syzbot turned up in the new patches to mitigate the thundering herd when a lock is released" * tag 'locks-v4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux: locks: fix error in locks_move_blocks()
2 parents 810574c + bf77ae4 commit 135143b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/locks.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ static void locks_move_blocks(struct file_lock *new, struct file_lock *fl)
453453
return;
454454
spin_lock(&blocked_lock_lock);
455455
list_splice_init(&fl->fl_blocked_requests, &new->fl_blocked_requests);
456-
list_for_each_entry(f, &fl->fl_blocked_requests, fl_blocked_member)
456+
list_for_each_entry(f, &new->fl_blocked_requests, fl_blocked_member)
457457
f->fl_blocker = new;
458458
spin_unlock(&blocked_lock_lock);
459459
}

0 commit comments

Comments
 (0)