---
libfdisk/src/context.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/libfdisk/src/context.c b/libfdisk/src/context.c
index dc9f0f9..795718c 100644
--- a/libfdisk/src/context.c
+++ b/libfdisk/src/context.c
@@ -241,10 +241,6 @@ static int warn_wipe(struct fdisk_context *cxt)
* @fname: path to the device to be handled
* @readonly: how to open the device
*
- * If the @readonly flag is set to false, fdisk will attempt to open
- * the device with read-write mode and will fallback to read-only if
- * unsuccessful.
- *
* Returns: 0 on success, < 0 on error.
*/
int fdisk_context_assign_device(struct fdisk_context *cxt,
@@ -257,10 +253,8 @@ int fdisk_context_assign_device(struct fdisk_context *cxt,
reset_context(cxt);
- if (readonly == 1 || (fd = open(fname, O_RDWR|O_CLOEXEC)) < 0) {
- if ((fd = open(fname, O_RDONLY|O_CLOEXEC)) < 0)
- return -errno;
- readonly = 1;
+ if ((fd = open(fname, (readonly == 1 ? O_RDONLY : O_RDWR) | O_CLOEXEC)) < 0) {
+ goto fail;
}
cxt->dev_fd = fd;
--
1.9.0
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
