@@ -2132,7 +2132,7 @@ static int open_target(void)
if (out_fd == -1)
return sys_err_msg("cannot open the UBI volume '%s'",
output);
- if (ubi_set_property(out_fd, UBI_PROP_DIRECT_WRITE, 1))
+ if (ubi_set_property(out_fd, UBI_VOL_PROP_DIRECT_WRITE, 1))
return sys_err_msg("ubi_set_property failed");
if (check_volume_empty())
@@ -179,7 +179,7 @@ static void *write_thread(void *ptr)
return NULL;
}
- ret = ubi_set_property(fd, UBI_PROP_DIRECT_WRITE, 1);
+ ret = ubi_set_property(fd, UBI_VOL_PROP_DIRECT_WRITE, 1);
if (ret) {
failed("ubi_set_property");
errmsg("cannot set property for \"%s\"\n", vol_node);
@@ -436,7 +436,7 @@ int ubi_leb_change_start(libubi_t desc, int fd, int lnum, int bytes);
/**
* ubi_set_property - set volume propety.
* @fd: volume character device file descriptor
- * @property: the property to change (%UBI_PROP_DIRECT_WRITE, etc)
+ * @property: the property to change (%UBI_VOL_PROP_DIRECT_WRITE, etc)
* @value: new value of the changed property
*
* This function changes a property of a volume. Returns zero in case of
@@ -1345,13 +1345,13 @@ int ubi_get_vol_info1_nm(libubi_t desc, int dev_num, const char *name,
int ubi_set_property(int fd, uint8_t property, uint64_t value)
{
- struct ubi_set_prop_req r;
+ struct ubi_set_vol_prop_req r;
- memset(&r, 0, sizeof(struct ubi_set_prop_req));
+ memset(&r, 0, sizeof(struct ubi_set_vol_prop_req));
r.property = property;
r.value = value;
- return ioctl(fd, UBI_IOCSETPROP, &r);
+ return ioctl(fd, UBI_IOCSETVOLPROP, &r);
}
int ubi_leb_unmap(int fd, int lnum)
kernel commit 6748482f4153fc0e095aa3dc831d5edac5656a80 renamed: 'UBI_PROP_DIRECT_WRITE' to 'UBI_VOL_PROP_DIRECT_WRITE' structure from 'struct ubi_set_prop_req' to 'struct ubi_set_vol_prop_req'. and 'UBI_IOCSETPROP' to 'UBI_IOCSETVOLPROP' Signed-off-by: Richard Genoud <richard.genoud@gmail.com> --- mkfs.ubifs/mkfs.ubifs.c | 2 +- tests/ubi-tests/io_paral.c | 2 +- ubi-utils/include/libubi.h | 2 +- ubi-utils/libubi.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-)