Merge tag 'upstream-4.9-rc1' of git://git.infradead.org/linux-ubifs

[cascardo/linux.git] / drivers / mtd / ubi / kapi.c

diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c
index a9e2cef..88b1897 100644 (file)
--- a/drivers/mtd/ubi/kapi.c
+++ b/drivers/mtd/ubi/kapi.c
@@ -538,7 +538,7 @@ int ubi_leb_write(struct ubi_volume_desc *desc, int lnum, const void *buf,
        if (desc->mode == UBI_READONLY || vol->vol_type == UBI_STATIC_VOLUME)
                return -EROFS;
 
-       if (lnum < 0 || lnum >= vol->reserved_pebs || offset < 0 || len < 0 ||
+       if (!ubi_leb_valid(vol, lnum) || offset < 0 || len < 0 ||
            offset + len > vol->usable_leb_size ||
            offset & (ubi->min_io_size - 1) || len & (ubi->min_io_size - 1))
                return -EINVAL;
@@ -583,7 +583,7 @@ int ubi_leb_change(struct ubi_volume_desc *desc, int lnum, const void *buf,
        if (desc->mode == UBI_READONLY || vol->vol_type == UBI_STATIC_VOLUME)
                return -EROFS;
 
-       if (lnum < 0 || lnum >= vol->reserved_pebs || len < 0 ||
+       if (!ubi_leb_valid(vol, lnum) || len < 0 ||
            len > vol->usable_leb_size || len & (ubi->min_io_size - 1))
                return -EINVAL;
 
@@ -620,7 +620,7 @@ int ubi_leb_erase(struct ubi_volume_desc *desc, int lnum)
        if (desc->mode == UBI_READONLY || vol->vol_type == UBI_STATIC_VOLUME)
                return -EROFS;
 
-       if (lnum < 0 || lnum >= vol->reserved_pebs)
+       if (!ubi_leb_valid(vol, lnum))
                return -EINVAL;
 
        if (vol->upd_marker)
@@ -680,7 +680,7 @@ int ubi_leb_unmap(struct ubi_volume_desc *desc, int lnum)
        if (desc->mode == UBI_READONLY || vol->vol_type == UBI_STATIC_VOLUME)
                return -EROFS;
 
-       if (lnum < 0 || lnum >= vol->reserved_pebs)
+       if (!ubi_leb_valid(vol, lnum))
                return -EINVAL;
 
        if (vol->upd_marker)
@@ -716,13 +716,13 @@ int ubi_leb_map(struct ubi_volume_desc *desc, int lnum)
        if (desc->mode == UBI_READONLY || vol->vol_type == UBI_STATIC_VOLUME)
                return -EROFS;
 
-       if (lnum < 0 || lnum >= vol->reserved_pebs)
+       if (!ubi_leb_valid(vol, lnum))
                return -EINVAL;
 
        if (vol->upd_marker)
                return -EBADF;
 
-       if (vol->eba_tbl[lnum] >= 0)
+       if (ubi_eba_is_mapped(vol, lnum))
                return -EBADMSG;
 
        return ubi_eba_write_leb(ubi, vol, lnum, NULL, 0, 0);
@@ -751,13 +751,13 @@ int ubi_is_mapped(struct ubi_volume_desc *desc, int lnum)
 
        dbg_gen("test LEB %d:%d", vol->vol_id, lnum);
 
-       if (lnum < 0 || lnum >= vol->reserved_pebs)
+       if (!ubi_leb_valid(vol, lnum))
                return -EINVAL;
 
        if (vol->upd_marker)
                return -EBADF;
 
-       return vol->eba_tbl[lnum] >= 0;
+       return ubi_eba_is_mapped(vol, lnum);
 }
 EXPORT_SYMBOL_GPL(ubi_is_mapped);