From 7eed04029e7a09fa2061e96eedb3c947307e2535 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Fri, 14 Jul 2006 00:24:12 -0700 Subject: [PATCH] --- yaml --- r: 32636 b: refs/heads/master c: ddca60c59032b2c2babc0003cf01015aff340b79 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/ioctl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b5f9c652cf3d..8ba66e8c5382 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e56a7dcbb974d9725d80e50d70c6eed7f71110b +refs/heads/master: ddca60c59032b2c2babc0003cf01015aff340b79 diff --git a/trunk/block/ioctl.c b/trunk/block/ioctl.c index 9cfa2e1ecb24..309760b7e37f 100644 --- a/trunk/block/ioctl.c +++ b/trunk/block/ioctl.c @@ -72,7 +72,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user bdevp = bdget_disk(disk, part); if (!bdevp) return -ENOMEM; - mutex_lock(&bdevp->bd_mutex); + mutex_lock_nested(&bdevp->bd_mutex, BD_MUTEX_PARTITION); if (bdevp->bd_openers) { mutex_unlock(&bdevp->bd_mutex); bdput(bdevp); @@ -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, BD_MUTEX_WHOLE); delete_partition(disk, part); mutex_unlock(&bdev->bd_mutex); mutex_unlock(&bdevp->bd_mutex);