Commit 8cc9de3ebdf654601db51a516267dff89c49acc3
1 parent
67577927e8
Exists in
master
and in
20 other branches
mtd: Remove redundant mutex from mtd_blkdevs.c
In commit 2a48fc0ab24241755dc93bfd4f01d68efab47f5a ('block: autoconvert trivial BKL users to private mutex'), Arnd replaced the BKL usage with a mutex. However, Maxim has already provided a better fix in commit 480792b7bf188c29b8d4b10fee65c3a06ec5dbf7 ('mtd: blktrans: kill BKL'), which was simply to remove the BKL without replacing it — since he'd already made it do all necessary locking for itself. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Showing 1 changed file with 0 additions and 7 deletions Side-by-side Diff
drivers/mtd/mtd_blkdevs.c
| ... | ... | @@ -37,7 +37,6 @@ |
| 37 | 37 | |
| 38 | 38 | #include "mtdcore.h" |
| 39 | 39 | |
| 40 | -static DEFINE_MUTEX(mtd_blkdevs_mutex); | |
| 41 | 40 | static LIST_HEAD(blktrans_majors); |
| 42 | 41 | static DEFINE_MUTEX(blktrans_ref_mutex); |
| 43 | 42 | |
| ... | ... | @@ -185,7 +184,6 @@ |
| 185 | 184 | if (!dev) |
| 186 | 185 | return -ERESTARTSYS; /* FIXME: busy loop! -arnd*/ |
| 187 | 186 | |
| 188 | - mutex_lock(&mtd_blkdevs_mutex); | |
| 189 | 187 | mutex_lock(&dev->lock); |
| 190 | 188 | |
| 191 | 189 | if (dev->open++) |
| ... | ... | @@ -202,7 +200,6 @@ |
| 202 | 200 | unlock: |
| 203 | 201 | mutex_unlock(&dev->lock); |
| 204 | 202 | blktrans_dev_put(dev); |
| 205 | - mutex_unlock(&mtd_blkdevs_mutex); | |
| 206 | 203 | return ret; |
| 207 | 204 | } |
| 208 | 205 | |
| ... | ... | @@ -214,7 +211,6 @@ |
| 214 | 211 | if (!dev) |
| 215 | 212 | return ret; |
| 216 | 213 | |
| 217 | - mutex_lock(&mtd_blkdevs_mutex); | |
| 218 | 214 | mutex_lock(&dev->lock); |
| 219 | 215 | |
| 220 | 216 | if (--dev->open) |
| ... | ... | @@ -230,7 +226,6 @@ |
| 230 | 226 | unlock: |
| 231 | 227 | mutex_unlock(&dev->lock); |
| 232 | 228 | blktrans_dev_put(dev); |
| 233 | - mutex_unlock(&mtd_blkdevs_mutex); | |
| 234 | 229 | return ret; |
| 235 | 230 | } |
| 236 | 231 | |
| ... | ... | @@ -263,7 +258,6 @@ |
| 263 | 258 | if (!dev) |
| 264 | 259 | return ret; |
| 265 | 260 | |
| 266 | - mutex_lock(&mtd_blkdevs_mutex); | |
| 267 | 261 | mutex_lock(&dev->lock); |
| 268 | 262 | |
| 269 | 263 | if (!dev->mtd) |
| ... | ... | @@ -278,7 +272,6 @@ |
| 278 | 272 | } |
| 279 | 273 | unlock: |
| 280 | 274 | mutex_unlock(&dev->lock); |
| 281 | - mutex_unlock(&mtd_blkdevs_mutex); | |
| 282 | 275 | blktrans_dev_put(dev); |
| 283 | 276 | return ret; |
| 284 | 277 | } |