Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
disk-utils/mkswap.c | 25 ++++++++-----------------
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index c7166f7..02639ce 100644
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -238,25 +238,16 @@ static void open_device(struct mkswap_control *ctl)
assert(ctl);
assert(ctl->devname);
- if (stat(ctl->devname, &ctl->devstat) < 0)
- err(EXIT_FAILURE, _("stat of %s failed"), ctl->devname);
-
- if (S_ISBLK(ctl->devstat.st_mode))
- ctl->fd = open(ctl->devname, O_RDWR | O_EXCL);
- else {
- if (ctl->check) {
- ctl->check = 0;
- warnx(_("warning: checking bad blocks from swap file is not supported: %s"),
- ctl->devname);
- }
- ctl->fd = open(ctl->devname, O_RDWR);
- }
+ ctl->fd = open_blkdev_or_file(ctl->devname, O_RDWR);
if (ctl->fd < 0)
err(EXIT_FAILURE, _("cannot open %s"), ctl->devname);
-
- if (S_ISBLK(ctl->devstat.st_mode))
- if (blkdev_is_misaligned(ctl->fd))
- warnx(_("warning: %s is misaligned"), ctl->devname);
+ if (fstat(ctl->fd, &ctl->devstat) < 0)
+ err(EXIT_FAILURE, _("stat of %s failed"), ctl->devname);
+ if (ctl->check && S_ISREG(ctl->devstat.st_mode)) {
+ ctl->check = 0;
+ warnx(_("warning: checking bad blocks from swap file is not supported: %s"),
+ ctl->devname);
+ }
}
static void wipe_device(struct mkswap_control *ctl)
--
2.6.2
--
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
