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()
This commit is contained in:
@@ -453,7 +453,7 @@ static void locks_move_blocks(struct file_lock *new, struct file_lock *fl)
|
||||
return;
|
||||
spin_lock(&blocked_lock_lock);
|
||||
list_splice_init(&fl->fl_blocked_requests, &new->fl_blocked_requests);
|
||||
list_for_each_entry(f, &fl->fl_blocked_requests, fl_blocked_member)
|
||||
list_for_each_entry(f, &new->fl_blocked_requests, fl_blocked_member)
|
||||
f->fl_blocker = new;
|
||||
spin_unlock(&blocked_lock_lock);
|
||||
}
|
||||
|
Reference in New Issue
Block a user