kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zdsfs: Use libdasd provided ioctl functions

Browse Source 
GitHub-ID: #19

Signed-off-by: Rafael Fonseca <r4f4rfs@gmail.com>
Acked-by: Jan Höppner <hoeppner@linux.vnet.ibm.com>
Signed-off-by: Stefan Haberland <sth@linux.vnet.ibm.com>
This commit is contained in:
Rafael Fonseca
2017-11-28 13:28:16 +01:00
committed by Stefan Haberland
parent 8b11ea73ac
commit caeb4470cd
2 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libzds/libzds.c
View File

@@ -13,16 +13,13 @@
*/
#include <errno.h>
#include <fcntl.h>
#include <linux/types.h>
#include <malloc.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <unistd.h>
#include "lib/dasd_base.h"
#include "lib/libzds.h"
#include "lib/u2s.h"
#include "lib/util_base.h"
@@ -31,13 +28,6 @@
/** @cond PRIVATE */
/******************************************************************************/
/* ioctl related definitions */
/******************************************************************************/
/* device size in bytes (u64 *arg) */
#define BLKGETSIZE64 _IOR(0x12, 114, size_t)
/******************************************************************************/
/* libzds structure definitions */
@@ -480,18 +470,11 @@ void lzds_zdsroot_free(struct zdsroot *root)
*/
static int dasd_read_geometry(struct dasd *dasd)
{
int fd;
unsigned long long size_in_bytes;
errorlog_clear(dasd->log);
fd = open(dasd->device, O_RDONLY);
if (fd < 0)
return errorlog_add_message(
&dasd->log, NULL, EIO,
"read geometry: could not open device %s\n",
dasd->device);
if (ioctl(fd, BLKGETSIZE64, &size_in_bytes) != 0)
if (dasd_get_blocksize_in_bytes(dasd->device, &size_in_bytes) != 0)
return errorlog_add_message(
&dasd->log, NULL, EIO,
"read geometry: could not get size from device %s\n",
@@ -505,7 +488,6 @@ static int dasd_read_geometry(struct dasd *dasd)
dasd->label_block = 2;
dasd->heads = 15;
dasd->cylinders = (size_in_bytes / (dasd->heads * RAWTRACKSIZE));
close(fd);
return 0;
}

3
zdsfs/Makefile
View File

@@ -3,7 +3,8 @@ include ../common.mak
libs = $(rootdir)/libzds/libzds.a \
$(rootdir)/libvtoc/libvtoc.a \
$(rootdir)/libu2s/libu2s.a \
$(rootdir)/libutil/libutil.a
$(rootdir)/libutil/libutil.a \
$(rootdir)/libdasd/libdasd.a
ifeq (${HAVE_FUSE},0)