From 312e784fb06eaafff4cfebe29c74b8d0ecc09167 Mon Sep 17 00:00:00 2001 From: Richard Genoud Date: Wed, 22 Aug 2012 11:27:56 +0200 Subject: UBI: sync ubi-user.h with kernel v3.6-rc1 Also remove the eraseblock type support, because kernel commit a65a0eb6d198e058687a9214683bd1c418f20d39 set the dtype parameter as obsolete. Also adjust to some renames: * 'UBI_PROP_DIRECT_WRITE' -> 'UBI_VOL_PROP_DIRECT_WRITE' * 'struct ubi_set_prop_req' -> 'struct ubi_set_vol_prop_req'. * 'UBI_IOCSETPROP' -> 'UBI_IOCSETVOLPROP' Signed-off-by: Richard Genoud Signed-off-by: Artem Bityutskiy --- mkfs.ubifs/lpt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mkfs.ubifs/lpt.c') diff --git a/mkfs.ubifs/lpt.c b/mkfs.ubifs/lpt.c index 60002ff..f6d4352 100644 --- a/mkfs.ubifs/lpt.c +++ b/mkfs.ubifs/lpt.c @@ -410,7 +410,7 @@ int create_lpt(struct ubifs_info *c) alen = ALIGN(len, c->min_io_size); set_ltab(c, lnum, c->leb_size - alen, alen - len); memset(p, 0xff, alen - len); - err = write_leb(lnum++, alen, buf, UBI_SHORTTERM); + err = write_leb(lnum++, alen, buf); if (err) goto out; p = buf; @@ -452,7 +452,7 @@ int create_lpt(struct ubifs_info *c) set_ltab(c, lnum, c->leb_size - alen, alen - len); memset(p, 0xff, alen - len); - err = write_leb(lnum++, alen, buf, UBI_SHORTTERM); + err = write_leb(lnum++, alen, buf); if (err) goto out; p = buf; @@ -499,7 +499,7 @@ int create_lpt(struct ubifs_info *c) alen = ALIGN(len, c->min_io_size); set_ltab(c, lnum, c->leb_size - alen, alen - len); memset(p, 0xff, alen - len); - err = write_leb(lnum++, alen, buf, UBI_SHORTTERM); + err = write_leb(lnum++, alen, buf); if (err) goto out; p = buf; @@ -522,7 +522,7 @@ int create_lpt(struct ubifs_info *c) alen = ALIGN(len, c->min_io_size); set_ltab(c, lnum, c->leb_size - alen, alen - len); memset(p, 0xff, alen - len); - err = write_leb(lnum++, alen, buf, UBI_SHORTTERM); + err = write_leb(lnum++, alen, buf); if (err) goto out; p = buf; @@ -542,7 +542,7 @@ int create_lpt(struct ubifs_info *c) /* Write remaining buffer */ memset(p, 0xff, alen - len); - err = write_leb(lnum, alen, buf, UBI_SHORTTERM); + err = write_leb(lnum, alen, buf); if (err) goto out; -- cgit v1.2.3