projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MIPS] Add missing silicon revisions for BCM112x
[firefly-linux-kernel-4.4.55.git]
/
block
/
ioctl.c
diff --git
a/block/ioctl.c
b/block/ioctl.c
index f6962b64660ea67c6092c6303d7d52cd69bffbeb..e06dbe9bc8588ac7aa6eb96b3378d16bdbaa9816 100644
(file)
--- 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 */
}
}
/* 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:
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);
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);
delete_partition(disk, part);
mutex_unlock(&bdev->bd_mutex);
mutex_unlock(&bdevp->bd_mutex);