diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2015-07-20 15:21:33 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2015-07-20 15:21:33 -0400 |
| commit | 6bb0e2dc64953ce9b8d09a0aa32b04c20fdcdacf (patch) | |
| tree | d64a8ade096e271d1cccbcedc39226a839f3ddf0 /block | |
| parent | bba903c2bb20dbb6c57a8ba3889f9b8f09dcc6e0 (diff) | |
| parent | 866cebe251f4fb2b435f4ecfe6d3bb4025938533 (diff) | |
| download | linux-rt-6bb0e2dc64953ce9b8d09a0aa32b04c20fdcdacf.tar.gz | |
Merge tag 'v3.18.18' into v3.18-rt
Linux 3.18.18
Conflicts:
kernel/softirq.c
Diffstat (limited to 'block')
| -rw-r--r-- | block/genhd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/block/genhd.c b/block/genhd.c index 0a536dc05f3b..c2fb3f7bdec4 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -422,9 +422,9 @@ int blk_alloc_devt(struct hd_struct *part, dev_t *devt) /* allocate ext devt */ idr_preload(GFP_KERNEL); - spin_lock(&ext_devt_lock); + spin_lock_bh(&ext_devt_lock); idx = idr_alloc(&ext_devt_idr, part, 0, NR_EXT_DEVT, GFP_NOWAIT); - spin_unlock(&ext_devt_lock); + spin_unlock_bh(&ext_devt_lock); idr_preload_end(); if (idx < 0) @@ -449,9 +449,9 @@ void blk_free_devt(dev_t devt) return; if (MAJOR(devt) == BLOCK_EXT_MAJOR) { - spin_lock(&ext_devt_lock); + spin_lock_bh(&ext_devt_lock); idr_remove(&ext_devt_idr, blk_mangle_minor(MINOR(devt))); - spin_unlock(&ext_devt_lock); + spin_unlock_bh(&ext_devt_lock); } } @@ -691,13 +691,13 @@ struct gendisk *get_gendisk(dev_t devt, int *partno) } else { struct hd_struct *part; - spin_lock(&ext_devt_lock); + spin_lock_bh(&ext_devt_lock); part = idr_find(&ext_devt_idr, blk_mangle_minor(MINOR(devt))); if (part && get_disk(part_to_disk(part))) { *partno = part->partno; disk = part_to_disk(part); } - spin_unlock(&ext_devt_lock); + spin_unlock_bh(&ext_devt_lock); } return disk; |