]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
mkfs: get size of device properly
authorEric Sandeen <sandeen@sandeen.net>
Sun, 17 Jan 2010 16:31:58 +0000 (10:31 -0600)
committerEric Sandeen <sandeen@sandeen.net>
Sun, 17 Jan 2010 16:31:58 +0000 (10:31 -0600)
Test device node size properly in check_overwrite, st_size
is only valid for regular files.

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>
mkfs/xfs_mkfs.c

index 0743976a9ded77a2f1143f64393bc36078f3467c..689425dfac7c40baed481f367b786cbefd93f36e 100644 (file)
@@ -297,18 +297,23 @@ check_overwrite(
        const char      *type;
        blkid_probe     pr = NULL;
        int             ret;
-       struct stat     statbuf;
+       int             fd;
+       long long       size;
+       int             bsz;
 
        if (!device || !*device)
                return 0;
 
        ret = -1; /* will reset on success of all setup calls */
 
-       if (stat(device, &statbuf) < 0)
+       fd = open(device, O_RDONLY);
+       if (fd < 0)
                goto out;
+       platform_findsizes(device, fd, &size, &bsz);
+       close(fd);
 
        /* nothing to overwrite on a 0-length device */
-       if (statbuf.st_size == 0) {
+       if (size == 0) {
                ret = 0;
                goto out;
        }