Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 82d4dc5adb0055393248ad4ab8de392fac708a12

Authored by Ingo Molnar
Committed by Linus Torvalds
1 parent f85221dd74
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

[PATCH] sem2mutex: drivers/block/nbd.c 

Semaphore to mutex conversion.

The conversion was generated via scripts, and the result was validated
automatically via a script as well.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Paul Clements <Paul.Clements@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 2 changed files with 10 additions and 9 deletions Side-by-side Diff

... ... @@ -459,9 +459,9 @@
459 459 req->errors = 0;
460 460 spin_unlock_irq(q->queue_lock);
461 461  
462   - down(&lo->tx_lock);
  462 + mutex_lock(&lo->tx_lock);
463 463 if (unlikely(!lo->sock)) {
464   - up(&lo->tx_lock);
  464 + mutex_unlock(&lo->tx_lock);
465 465 printk(KERN_ERR "%s: Attempted send on closed socket\n",
466 466 lo->disk->disk_name);
467 467 req->errors++;
... ... @@ -484,7 +484,7 @@
484 484 }
485 485  
486 486 lo->active_req = NULL;
487   - up(&lo->tx_lock);
  487 + mutex_unlock(&lo->tx_lock);
488 488 wake_up_all(&lo->active_wq);
489 489  
490 490 spin_lock_irq(q->queue_lock);
491 491  
... ... @@ -534,9 +534,9 @@
534 534  
535 535 case NBD_CLEAR_SOCK:
536 536 error = 0;
537   - down(&lo->tx_lock);
  537 + mutex_lock(&lo->tx_lock);
538 538 lo->sock = NULL;
539   - up(&lo->tx_lock);
  539 + mutex_unlock(&lo->tx_lock);
540 540 file = lo->file;
541 541 lo->file = NULL;
542 542 nbd_clear_que(lo);
... ... @@ -590,7 +590,7 @@
590 590 * FIXME: This code is duplicated from sys_shutdown, but
591 591 * there should be a more generic interface rather than
592 592 * calling socket ops directly here */
593   - down(&lo->tx_lock);
  593 + mutex_lock(&lo->tx_lock);
594 594 if (lo->sock) {
595 595 printk(KERN_WARNING "%s: shutting down socket\n",
596 596 lo->disk->disk_name);
... ... @@ -598,7 +598,7 @@
598 598 SEND_SHUTDOWN|RCV_SHUTDOWN);
599 599 lo->sock = NULL;
600 600 }
601   - up(&lo->tx_lock);
  601 + mutex_unlock(&lo->tx_lock);
602 602 file = lo->file;
603 603 lo->file = NULL;
604 604 nbd_clear_que(lo);
... ... @@ -683,7 +683,7 @@
683 683 nbd_dev[i].flags = 0;
684 684 spin_lock_init(&nbd_dev[i].queue_lock);
685 685 INIT_LIST_HEAD(&nbd_dev[i].queue_head);
686   - init_MUTEX(&nbd_dev[i].tx_lock);
  686 + mutex_init(&nbd_dev[i].tx_lock);
687 687 init_waitqueue_head(&nbd_dev[i].active_wq);
688 688 nbd_dev[i].blksize = 1024;
689 689 nbd_dev[i].bytesize = 0x7ffffc00ULL << 10; /* 2TB */
... ... @@ -38,6 +38,7 @@
38 38 #ifdef __KERNEL__
39 39  
40 40 #include <linux/wait.h>
  41 +#include <linux/mutex.h>
41 42  
42 43 /* values for flags field */
43 44 #define NBD_READ_ONLY 0x0001
... ... @@ -57,7 +58,7 @@
57 58 struct request *active_req;
58 59 wait_queue_head_t active_wq;
59 60  
60   - struct semaphore tx_lock;
  61 + struct mutex tx_lock;
61 62 struct gendisk *disk;
62 63 int blksize;
63 64 u64 bytesize;