diff options
Diffstat (limited to 'block/ioctl.c')
-rw-r--r-- | block/ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/ioctl.c b/block/ioctl.c index 58aab630dfc1..f6962b64660e 100644 --- a/block/ioctl.c +++ b/block/ioctl.c | |||
@@ -72,7 +72,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user | |||
72 | bdevp = bdget_disk(disk, part); | 72 | bdevp = bdget_disk(disk, part); |
73 | if (!bdevp) | 73 | if (!bdevp) |
74 | return -ENOMEM; | 74 | return -ENOMEM; |
75 | mutex_lock_nested(&bdevp->bd_mutex, BD_MUTEX_PARTITION); | 75 | mutex_lock(&bdevp->bd_mutex); |
76 | if (bdevp->bd_openers) { | 76 | if (bdevp->bd_openers) { |
77 | mutex_unlock(&bdevp->bd_mutex); | 77 | mutex_unlock(&bdevp->bd_mutex); |
78 | bdput(bdevp); | 78 | bdput(bdevp); |
@@ -82,7 +82,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user | |||
82 | fsync_bdev(bdevp); | 82 | fsync_bdev(bdevp); |
83 | invalidate_bdev(bdevp, 0); | 83 | invalidate_bdev(bdevp, 0); |
84 | 84 | ||
85 | mutex_lock_nested(&bdev->bd_mutex, BD_MUTEX_WHOLE); | 85 | mutex_lock(&bdev->bd_mutex); |
86 | delete_partition(disk, part); | 86 | delete_partition(disk, part); |
87 | mutex_unlock(&bdev->bd_mutex); | 87 | mutex_unlock(&bdev->bd_mutex); |
88 | mutex_unlock(&bdevp->bd_mutex); | 88 | mutex_unlock(&bdevp->bd_mutex); |
@@ -290,7 +290,7 @@ int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd, | |||
290 | ENOIOCTLCMD for unknown ioctls. */ | 290 | ENOIOCTLCMD for unknown ioctls. */ |
291 | long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) | 291 | long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg) |
292 | { | 292 | { |
293 | struct block_device *bdev = file->f_dentry->d_inode->i_bdev; | 293 | struct block_device *bdev = file->f_path.dentry->d_inode->i_bdev; |
294 | struct gendisk *disk = bdev->bd_disk; | 294 | struct gendisk *disk = bdev->bd_disk; |
295 | int ret = -ENOIOCTLCMD; | 295 | int ret = -ENOIOCTLCMD; |
296 | if (disk->fops->compat_ioctl) { | 296 | if (disk->fops->compat_ioctl) { |