Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2024-11-23 07:18:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

libntfs: Don't use "ioctl" as a struct name.

Browse Source 
This will allow unistd.h to define it even in _KERNEL_MODE.

Change-Id: I6669c670353dda7cc202017d707a6bce3b5519e0
Reviewed-on: https://review.haiku-os.org/c/haiku/+/8561
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
Augustin Cavalier 2024-11-11 13:26:44 -05:00 committed by waddlesplash
parent 115a635f13
commit b802b65b09
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/add-ons/kernel/file_systems/ntfs/libntfs/device.c
View File

@ -606,9 +606,9 @@ s64 ntfs_device_size_get(struct ntfs_device *dev, int block_size)
partition_info partitionInfo;
device_geometry geometry;
if (dev->d_ops->ioctl(dev, B_GET_PARTITION_INFO, &partitionInfo) == 0)
if (dev->d_ops->control(dev, B_GET_PARTITION_INFO, &partitionInfo) == 0)
size = partitionInfo.size;
else if (dev->d_ops->ioctl(dev, B_GET_GEOMETRY, &geometry) == 0) {
else if (dev->d_ops->control(dev, B_GET_GEOMETRY, &geometry) == 0) {
size = (off_t)geometry.cylinder_count * geometry.sectors_per_track
* geometry.head_count * geometry.bytes_per_sector;
}

2
src/add-ons/kernel/file_systems/ntfs/libntfs/device.h
View File

@ -111,7 +111,7 @@ struct ntfs_device_operations {
s64 offset);
int (*sync)(struct ntfs_device *dev);
int (*stat)(struct ntfs_device *dev, struct stat *buf);
int (*ioctl)(struct ntfs_device *dev, unsigned long request,
int (*control)(struct ntfs_device *dev, unsigned long request,
void *argp);
};

2
src/add-ons/kernel/file_systems/ntfs/libntfs/unix_io.c
View File

@ -388,5 +388,5 @@ struct ntfs_device_operations ntfs_device_unix_io_ops = {
.pwrite = ntfs_device_unix_io_pwrite,
.sync = ntfs_device_unix_io_sync,
.stat = ntfs_device_unix_io_stat,
.ioctl = ntfs_device_unix_io_ioctl,
.control = ntfs_device_unix_io_ioctl,
};