From: "Maciej Małecki" <me@mmalecki.com>
To: util-linux@vger.kernel.org
Cc: "Maciej Małecki" <me@mmalecki.com>
Subject: [PATCH v2 2/3] libfdisk: remove `O_RDONLY` fallback mode when opening device
Date: Mon, 3 Mar 2014 22:14:06 +0100 [thread overview]
Message-ID: <1393881247-17092-2-git-send-email-me@mmalecki.com> (raw)
In-Reply-To: <1393881247-17092-1-git-send-email-me@mmalecki.com>
---
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
next prev parent reply other threads:[~2014-03-03 21:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-27 3:26 [PATCH 1/2] fdisk: warn if opening a device in write mode failed Maciej Małecki
2014-02-27 3:26 ` [PATCH 2/2] fdisk: do not allow writing to a read-only device Maciej Małecki
2014-02-28 2:32 ` [PATCH 1/2] fdisk: warn if opening a device in write mode failed Davidlohr Bueso
2014-02-28 11:00 ` Maciej Małecki
2014-02-28 16:23 ` Phillip Susi
2014-02-28 18:18 ` Maciej Małecki
2014-02-28 18:27 ` Davidlohr Bueso
2014-02-28 19:18 ` Phillip Susi
2014-03-03 9:04 ` Karel Zak
2014-03-03 21:19 ` Maciej Małecki
2014-03-03 21:47 ` Phillip Susi
2014-03-21 13:10 ` Karel Zak
2014-03-03 21:14 ` [PATCH v2 1/3] fdisk: do not allow writing to a read-only device Maciej Małecki
2014-03-03 21:14 ` Maciej Małecki [this message]
2014-03-03 21:14 ` [PATCH v2 3/3] fdisk: retry opening device in read-only mode Maciej Małecki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1393881247-17092-2-git-send-email-me@mmalecki.com \
--to=me@mmalecki.com \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.