summaryrefslogtreecommitdiffstats
path: root/fdisk/sfdisk.c
diff options
context:
space:
mode:
authorKarel Zak2007-11-07 19:05:31 +0100
committerKarel Zak2007-11-07 19:05:31 +0100
commit810f986b42ff7ecc805d134ef32013c3343df31e (patch)
treea3bed44c8f415166ea2d75dbb202793762f1ae43 /fdisk/sfdisk.c
parentmkswap: cleanup kB vs. KiB usage in error messages (diff)
downloadkernel-qcow2-util-linux-810f986b42ff7ecc805d134ef32013c3343df31e.tar.gz
kernel-qcow2-util-linux-810f986b42ff7ecc805d134ef32013c3343df31e.tar.xz
kernel-qcow2-util-linux-810f986b42ff7ecc805d134ef32013c3343df31e.zip
fdisk: cleanup BLK* ioctls usage
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisk/sfdisk.c')
-rw-r--r--fdisk/sfdisk.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c
index cb4229f07..94a7c9587 100644
--- a/fdisk/sfdisk.c
+++ b/fdisk/sfdisk.c
@@ -48,6 +48,7 @@
#include <sys/utsname.h>
#include <linux/unistd.h> /* _syscall */
#include "nls.h"
+#include "blkdev.h"
#include "common.h"
#include "gpt.h"
@@ -458,7 +459,7 @@ get_geometry(char *dev, int fd, int silent) {
R.cylinders = 0;
R.total_size = 0;
- if (disksize(fd, &sectors)) {
+ if (blkdev_get_sectors(fd, &sectors) == -1) {
/* maybe an ordinary file */
struct stat s;
@@ -2810,7 +2811,7 @@ do_size (char *dev, int silent) {
if (fd < 0)
return;
- if (disksize(fd, &size)) {
+ if (blkdev_get_sectors(fd, &size) == -1) {
if (!silent) {
perror(dev);
fatal(_("Cannot get size of %s\n"), dev);