X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=block%2Fioctl.c;h=e06dbe9bc8588ac7aa6eb96b3378d16bdbaa9816;hb=67060e37994444ee9c0bd2413c8baa6cc58e7adb;hp=f6962b64660ea67c6092c6303d7d52cd69bffbeb;hpb=40b20c257a13c5a526ac540bc5e43d0fdf29792a;p=powerpc.git

diff --git a/block/ioctl.c b/block/ioctl.c
index f6962b6466..e06dbe9bc8 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -61,7 +61,7 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user
 				}
 			}
 			/* all seems OK */
-			add_partition(disk, part, start, length);
+			add_partition(disk, part, start, length, ADDPART_FLAG_NONE);
 			mutex_unlock(&bdev->bd_mutex);
 			return 0;
 		case BLKPG_DEL_PARTITION:
@@ -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);