| Message ID | 51117109.6000504@inktank.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Josh Durgin <josh.durgin@inktank.com> On 02/05/2013 12:52 PM, Alex Elder wrote: > This commit: > bc7a62ee5 rbd: prevent open for image being removed > added checking for removing rbd before allowing an open, and used > the same request spinlock for protecting that and updating the open > count as is used for the request queue. > > However it used the non-irq protected version of the spinlocks. > Fix that. > > Signed-off-by: Alex Elder <elder@inktank.com> > --- > drivers/block/rbd.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c > index 14a6967..91983a60 100644 > --- a/drivers/block/rbd.c > +++ b/drivers/block/rbd.c > @@ -394,12 +394,12 @@ static int rbd_open(struct block_device *bdev, > fmode_t mode) > if ((mode & FMODE_WRITE) && rbd_dev->mapping.read_only) > return -EROFS; > > - spin_lock(&rbd_dev->lock); > + spin_lock_irq(&rbd_dev->lock); > if (test_bit(RBD_DEV_FLAG_REMOVING, &rbd_dev->flags)) > removing = true; > else > rbd_dev->open_count++; > - spin_unlock(&rbd_dev->lock); > + spin_unlock_irq(&rbd_dev->lock); > if (removing) > return -ENOENT; > > @@ -416,9 +416,9 @@ static int rbd_release(struct gendisk *disk, fmode_t > mode) > struct rbd_device *rbd_dev = disk->private_data; > unsigned long open_count_before; > > - spin_lock(&rbd_dev->lock); > + spin_lock_irq(&rbd_dev->lock); > open_count_before = rbd_dev->open_count--; > - spin_unlock(&rbd_dev->lock); > + spin_unlock_irq(&rbd_dev->lock); > rbd_assert(open_count_before > 0); > > mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING); > @@ -4099,12 +4099,12 @@ static ssize_t rbd_remove(struct bus_type *bus, > goto done; > } > > - spin_lock(&rbd_dev->lock); > + spin_lock_irq(&rbd_dev->lock); > if (rbd_dev->open_count) > ret = -EBUSY; > else > set_bit(RBD_DEV_FLAG_REMOVING, &rbd_dev->flags); > - spin_unlock(&rbd_dev->lock); > + spin_unlock_irq(&rbd_dev->lock); > if (ret < 0) > goto done; > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 14a6967..91983a60 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -394,12 +394,12 @@ static int rbd_open(struct block_device *bdev, fmode_t mode) if ((mode & FMODE_WRITE) && rbd_dev->mapping.read_only) return -EROFS; - spin_lock(&rbd_dev->lock); + spin_lock_irq(&rbd_dev->lock); if (test_bit(RBD_DEV_FLAG_REMOVING, &rbd_dev->flags)) removing = true; else rbd_dev->open_count++; - spin_unlock(&rbd_dev->lock); + spin_unlock_irq(&rbd_dev->lock); if (removing) return -ENOENT;
This commit: bc7a62ee5 rbd: prevent open for image being removed added checking for removing rbd before allowing an open, and used the same request spinlock for protecting that and updating the open count as is used for the request queue. However it used the non-irq protected version of the spinlocks. Fix that. Signed-off-by: Alex Elder <elder@inktank.com> --- drivers/block/rbd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) @@ -416,9 +416,9 @@ static int rbd_release(struct gendisk *disk, fmode_t mode) struct rbd_device *rbd_dev = disk->private_data; unsigned long open_count_before; - spin_lock(&rbd_dev->lock); + spin_lock_irq(&rbd_dev->lock); open_count_before = rbd_dev->open_count--; - spin_unlock(&rbd_dev->lock); + spin_unlock_irq(&rbd_dev->lock); rbd_assert(open_count_before > 0); mutex_lock_nested(&ctl_mutex, SINGLE_DEPTH_NESTING); @@ -4099,12 +4099,12 @@ static ssize_t rbd_remove(struct bus_type *bus, goto done; } - spin_lock(&rbd_dev->lock); + spin_lock_irq(&rbd_dev->lock); if (rbd_dev->open_count) ret = -EBUSY; else set_bit(RBD_DEV_FLAG_REMOVING, &rbd_dev->flags); - spin_unlock(&rbd_dev->lock); + spin_unlock_irq(&rbd_dev->lock); if (ret < 0) goto done;