Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit f85221dd74f2708b78a2aa54de59944e44206d0e

Authored by Ingo Molnar
Committed by Linus Torvalds
1 parent 0ac1759abc
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/loop.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: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

drivers/block/loop.c
Diff comments   View file @ f85221d
... ... @@ -1144,7 +1144,7 @@
1144 1144 struct loop_device *lo = inode->i_bdev->bd_disk->private_data;
1145 1145 int err;
1146 1146  
1147   - down(&lo->lo_ctl_mutex);
  1147 + mutex_lock(&lo->lo_ctl_mutex);
1148 1148 switch (cmd) {
1149 1149 case LOOP_SET_FD:
1150 1150 err = loop_set_fd(lo, file, inode->i_bdev, arg);
... ... @@ -1170,7 +1170,7 @@
1170 1170 default:
1171 1171 err = lo->ioctl ? lo->ioctl(lo, cmd, arg) : -EINVAL;
1172 1172 }
1173   - up(&lo->lo_ctl_mutex);
  1173 + mutex_unlock(&lo->lo_ctl_mutex);
1174 1174 return err;
1175 1175 }
1176 1176  
1177 1177  
... ... @@ -1178,9 +1178,9 @@
1178 1178 {
1179 1179 struct loop_device *lo = inode->i_bdev->bd_disk->private_data;
1180 1180  
1181   - down(&lo->lo_ctl_mutex);
  1181 + mutex_lock(&lo->lo_ctl_mutex);
1182 1182 lo->lo_refcnt++;
1183   - up(&lo->lo_ctl_mutex);
  1183 + mutex_unlock(&lo->lo_ctl_mutex);
1184 1184  
1185 1185 return 0;
1186 1186 }
1187 1187  
... ... @@ -1189,9 +1189,9 @@
1189 1189 {
1190 1190 struct loop_device *lo = inode->i_bdev->bd_disk->private_data;
1191 1191  
1192   - down(&lo->lo_ctl_mutex);
  1192 + mutex_lock(&lo->lo_ctl_mutex);
1193 1193 --lo->lo_refcnt;
1194   - up(&lo->lo_ctl_mutex);
  1194 + mutex_unlock(&lo->lo_ctl_mutex);
1195 1195  
1196 1196 return 0;
1197 1197 }
1198 1198  
... ... @@ -1233,12 +1233,12 @@
1233 1233 xfer_funcs[n] = NULL;
1234 1234  
1235 1235 for (lo = &loop_dev[0]; lo < &loop_dev[max_loop]; lo++) {
1236   - down(&lo->lo_ctl_mutex);
  1236 + mutex_lock(&lo->lo_ctl_mutex);
1237 1237  
1238 1238 if (lo->lo_encryption == xfer)
1239 1239 loop_release_xfer(lo);
1240 1240  
1241   - up(&lo->lo_ctl_mutex);
  1241 + mutex_unlock(&lo->lo_ctl_mutex);
1242 1242 }
1243 1243  
1244 1244 return 0;
... ... @@ -1285,7 +1285,7 @@
1285 1285 lo->lo_queue = blk_alloc_queue(GFP_KERNEL);
1286 1286 if (!lo->lo_queue)
1287 1287 goto out_mem4;
1288   - init_MUTEX(&lo->lo_ctl_mutex);
  1288 + mutex_init(&lo->lo_ctl_mutex);
1289 1289 init_completion(&lo->lo_done);
1290 1290 init_completion(&lo->lo_bh_done);
1291 1291 lo->lo_number = i;
include/linux/loop.h
Diff comments   View file @ f85221d
... ... @@ -17,6 +17,7 @@
17 17 #include <linux/bio.h>
18 18 #include <linux/blkdev.h>
19 19 #include <linux/spinlock.h>
  20 +#include <linux/mutex.h>
20 21  
21 22 /* Possible states of device */
22 23 enum {
... ... @@ -60,7 +61,7 @@
60 61 int lo_state;
61 62 struct completion lo_done;
62 63 struct completion lo_bh_done;
63   - struct semaphore lo_ctl_mutex;
  64 + struct mutex lo_ctl_mutex;
64 65 int lo_pending;
65 66  
66 67 request_queue_t *lo_queue;