Skip to content

Commit

Permalink
vt: selection, fix double lock introduced by a merge
Browse files Browse the repository at this point in the history
The merge commit cb05c6c (Merge 5.6-rc5 into tty-next) introduced a
double lock to set_selection_kernel. vc_sel.lock is locked both in
set_selection_kernel and its callee __set_selection_kernel now.

Remove the latter.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Link: https://lore.kernel.org/r/20200316064544.4799-1-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Jiri Slaby authored and Greg Kroah-Hartman committed Mar 16, 2020
1 parent d49e795 commit 5b30dee
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion drivers/tty/vt/selection.c
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ static int __set_selection_kernel(struct tiocl_selection *v, struct tty_struct *
if (ps > pe) /* make vc_sel.start <= vc_sel.end */
swap(ps, pe);

mutex_lock(&vc_sel.lock);
if (vc_sel.cons != vc_cons[fg_console].d) {
clear_selection();
vc_sel.cons = vc_cons[fg_console].d;
Expand Down

0 comments on commit 5b30dee

Please sign in to comment.