UBI: use vol->usable_leb_size instead of (ubi->leb_size - vol->data_pad)

Boris Brezillon · richardweinberger · commit 5f09aaa9b30c · 2016-10-02T22:48:14.000+02:00
vol-&gt;usable_size is already set to ubi-&gt;leb_size - vol-&gt;data_pad. Use
vol-&gt;usable_size instead of recalculating it.

Signed-off-by: Boris Brezillon &lt;boris.brezillon@free-electrons.com&gt;
Signed-off-by: Richard Weinberger &lt;richard@nod.at&gt;
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
@@ -416,7 +416,7 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd,
 		}
 
 		rsvd_bytes = (long long)vol->reserved_pebs *
-					ubi->leb_size-vol->data_pad;
+					vol->usable_leb_size;
 		if (bytes < 0 || bytes > rsvd_bytes) {
 			err = -EINVAL;
 			break;

Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,7 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd,`
`416`	`416`	`}`
`417`	`417`
`418`	`418`	`rsvd_bytes = (long long)vol->reserved_pebs *`
`419`		`- ubi->leb_size-vol->data_pad;`
	`419`	`+ vol->usable_leb_size;`
`420`	`420`	`if (bytes < 0 \|\| bytes > rsvd_bytes) {`
`421`	`421`	`err = -EINVAL;`
`422`	`422`	`break;`