Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 935e2a26b85003c0bd52b6c92712c2f77a5f9d33

Authored by andrew hendry
Committed by David S. Miller
1 parent 37cda78741
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

X25: Remove bkl in sockopts 

Removes the BKL in x25 setsock and getsockopts.

Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 0 additions and 4 deletions Side-by-side Diff

... ... @@ -453,7 +453,6 @@
453 453 struct sock *sk = sock->sk;
454 454 int rc = -ENOPROTOOPT;
455 455  
456   - lock_kernel();
457 456 if (level != SOL_X25 || optname != X25_QBITINCL)
458 457 goto out;
459 458  
... ... @@ -471,7 +470,6 @@
471 470 clear_bit(X25_Q_BIT_FLAG, &x25_sk(sk)->flags);
472 471 rc = 0;
473 472 out:
474   - unlock_kernel();
475 473 return rc;
476 474 }
477 475  
... ... @@ -481,7 +479,6 @@
481 479 struct sock *sk = sock->sk;
482 480 int val, len, rc = -ENOPROTOOPT;
483 481  
484   - lock_kernel();
485 482 if (level != SOL_X25 || optname != X25_QBITINCL)
486 483 goto out;
487 484  
... ... @@ -502,7 +499,6 @@
502 499 val = test_bit(X25_Q_BIT_FLAG, &x25_sk(sk)->flags);
503 500 rc = copy_to_user(optval, &val, len) ? -EFAULT : 0;
504 501 out:
505   - unlock_kernel();
506 502 return rc;
507 503 }
508 504