X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=block%2Fioctl.c;h=e06dbe9bc8588ac7aa6eb96b3378d16bdbaa9816;hb=8d3ee2cb0ab59f78fdc801ede7db15ef47387bd0;hp=e3f5eb9882cf4dfb403f6ca64f7262180b9db0fa;hpb=54c66f6d781e03dc0b23956234963c4911e6d1c0;p=~andy%2Flinux diff --git a/block/ioctl.c b/block/ioctl.c index e3f5eb9882c..e06dbe9bc85 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -82,7 +82,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user fsync_bdev(bdevp); invalidate_bdev(bdevp, 0); - mutex_lock(&bdev->bd_mutex); + mutex_lock_nested(&bdev->bd_mutex, 1); delete_partition(disk, part); mutex_unlock(&bdev->bd_mutex); mutex_unlock(&bdevp->bd_mutex);