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

Commit 8974b15c authored by Richard Weinberger's avatar Richard Weinberger Committed by Artem Bityutskiy
Browse files

UBI: Wire-up ->fm_sem 



Fastmap uses ->fm_sem to stop EBA changes while writing
a new fastmap.

Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent 77e6c2f0

drivers/mtd/ubi/eba.c

+12 −0
Original line number Diff line number Diff line
@@ -340,7 +340,9 @@ int ubi_eba_unmap_leb(struct ubi_device *ubi, struct ubi_volume *vol, 


	dbg_eba("erase LEB %d:%d, PEB %d", vol_id, lnum, pnum);



	down_read(&ubi->fm_sem);

	vol->eba_tbl[lnum] = UBI_LEB_UNMAPPED;

	up_read(&ubi->fm_sem);

	err = ubi_wl_put_peb(ubi, vol_id, lnum, pnum, 0);



out_unlock:
@@ -548,7 +550,9 @@ static int recover_peb(struct ubi_device *ubi, int pnum, int vol_id, int lnum, 
	mutex_unlock(&ubi->buf_mutex);

	ubi_free_vid_hdr(ubi, vid_hdr);



	down_read(&ubi->fm_sem);

	vol->eba_tbl[lnum] = new_pnum;

	up_read(&ubi->fm_sem);

	ubi_wl_put_peb(ubi, vol_id, lnum, pnum, 1);



	ubi_msg("data was successfully recovered");
@@ -665,7 +669,9 @@ int ubi_eba_write_leb(struct ubi_device *ubi, struct ubi_volume *vol, int lnum, 
		}

	}



	down_read(&ubi->fm_sem);

	vol->eba_tbl[lnum] = pnum;

	up_read(&ubi->fm_sem);



	leb_write_unlock(ubi, vol_id, lnum);

	ubi_free_vid_hdr(ubi, vid_hdr);
@@ -783,7 +789,9 @@ int ubi_eba_write_leb_st(struct ubi_device *ubi, struct ubi_volume *vol, 
	}



	ubi_assert(vol->eba_tbl[lnum] < 0);

	down_read(&ubi->fm_sem);

	vol->eba_tbl[lnum] = pnum;

	up_read(&ubi->fm_sem);



	leb_write_unlock(ubi, vol_id, lnum);

	ubi_free_vid_hdr(ubi, vid_hdr);
@@ -904,7 +912,9 @@ int ubi_eba_atomic_leb_change(struct ubi_device *ubi, struct ubi_volume *vol, 
			goto out_leb_unlock;

	}



	down_read(&ubi->fm_sem);

	vol->eba_tbl[lnum] = pnum;

	up_read(&ubi->fm_sem);



out_leb_unlock:

	leb_write_unlock(ubi, vol_id, lnum);
@@ -1151,7 +1161,9 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to, 
	}



	ubi_assert(vol->eba_tbl[lnum] == from);

	down_read(&ubi->fm_sem);

	vol->eba_tbl[lnum] = to;

	up_read(&ubi->fm_sem);



out_unlock_buf:

	mutex_unlock(&ubi->buf_mutex);