Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d856c13c authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Artem Bityutskiy
Browse files

UBI: replace memcpy with struct assignment 

This kind of memcpy() is error-prone. Its replacement with a struct
assignment is prefered because it's type-safe and much easier to read.

Found by coccinelle. Hand patched and reviewed.
Tested by compilation only.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/

)

// <smpl>
@@
identifier struct_name;
struct struct_name to;
struct struct_name from;
expression E;
@@
-memcpy(&(to), &(from), E);
+to = from;
// </smpl>

Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: default avatarEzequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent 38f92cca

drivers/mtd/ubi/build.c

+1 −2
Original line number Diff line number Diff line
@@ -825,8 +825,7 @@ static int autoresize(struct ubi_device *ubi, int vol_id) 
		 * No available PEBs to re-size the volume, clear the flag on

		 * flash and exit.

		 */

		memcpy(&vtbl_rec, &ubi->vtbl[vol_id],

		       sizeof(struct ubi_vtbl_record));

		vtbl_rec = ubi->vtbl[vol_id];

		err = ubi_change_vtbl_record(ubi, vol_id, &vtbl_rec);

		if (err)

			ubi_err("cannot clean auto-resize flag for volume %d",

drivers/mtd/ubi/upd.c

+2 −4
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ static int set_update_marker(struct ubi_device *ubi, struct ubi_volume *vol) 
		return 0;

	}



	memcpy(&vtbl_rec, &ubi->vtbl[vol->vol_id],

	       sizeof(struct ubi_vtbl_record));

	vtbl_rec = ubi->vtbl[vol->vol_id];

	vtbl_rec.upd_marker = 1;



	mutex_lock(&ubi->device_mutex);
@@ -93,8 +92,7 @@ static int clear_update_marker(struct ubi_device *ubi, struct ubi_volume *vol, 


	dbg_gen("clear update marker for volume %d", vol->vol_id);



	memcpy(&vtbl_rec, &ubi->vtbl[vol->vol_id],

	       sizeof(struct ubi_vtbl_record));

	vtbl_rec = ubi->vtbl[vol->vol_id];

	ubi_assert(vol->upd_marker && vtbl_rec.upd_marker);

	vtbl_rec.upd_marker = 0;

drivers/mtd/ubi/vmt.c

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ int ubi_resize_volume(struct ubi_volume_desc *desc, int reserved_pebs) 
	}



	/* Change volume table record */

	memcpy(&vtbl_rec, &ubi->vtbl[vol_id], sizeof(struct ubi_vtbl_record));

	vtbl_rec = ubi->vtbl[vol_id];

	vtbl_rec.reserved_pebs = cpu_to_be32(reserved_pebs);

	err = ubi_change_vtbl_record(ubi, vol_id, &vtbl_rec);

	if (err)