projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
UBI: Fastmap: Locking updates
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mtd
/
ubi
/
eba.c
diff --git
a/drivers/mtd/ubi/eba.c
b/drivers/mtd/ubi/eba.c
index 4757cef756f7130baf2515a65c98c7108b530ca0..51bca035cd83c5b60d8912d22f358984f13abe1f 100644
(file)
--- a/
drivers/mtd/ubi/eba.c
+++ b/
drivers/mtd/ubi/eba.c
@@
-340,9
+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);
dbg_eba("erase LEB %d:%d, PEB %d", vol_id, lnum, pnum);
- down_read(&ubi->fm_sem);
+ down_read(&ubi->fm_
eba_
sem);
vol->eba_tbl[lnum] = UBI_LEB_UNMAPPED;
vol->eba_tbl[lnum] = UBI_LEB_UNMAPPED;
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
err = ubi_wl_put_peb(ubi, vol_id, lnum, pnum, 0);
out_unlock:
err = ubi_wl_put_peb(ubi, vol_id, lnum, pnum, 0);
out_unlock:
@@
-567,7
+567,7
@@
retry:
new_pnum = ubi_wl_get_peb(ubi);
if (new_pnum < 0) {
ubi_free_vid_hdr(ubi, vid_hdr);
new_pnum = ubi_wl_get_peb(ubi);
if (new_pnum < 0) {
ubi_free_vid_hdr(ubi, vid_hdr);
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
return new_pnum;
}
return new_pnum;
}
@@
-578,14
+578,14
@@
retry:
if (err && err != UBI_IO_BITFLIPS) {
if (err > 0)
err = -EIO;
if (err && err != UBI_IO_BITFLIPS) {
if (err > 0)
err = -EIO;
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
goto out_put;
}
vid_hdr->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));
err = ubi_io_write_vid_hdr(ubi, new_pnum, vid_hdr);
if (err) {
goto out_put;
}
vid_hdr->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));
err = ubi_io_write_vid_hdr(ubi, new_pnum, vid_hdr);
if (err) {
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
goto write_error;
}
goto write_error;
}
@@
-597,7
+597,7
@@
retry:
if (offset > 0) {
err = ubi_io_read_data(ubi, ubi->peb_buf, pnum, 0, offset);
if (err && err != UBI_IO_BITFLIPS) {
if (offset > 0) {
err = ubi_io_read_data(ubi, ubi->peb_buf, pnum, 0, offset);
if (err && err != UBI_IO_BITFLIPS) {
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
goto out_unlock;
}
}
goto out_unlock;
}
}
@@
-607,7
+607,7
@@
retry:
err = ubi_io_write_data(ubi, ubi->peb_buf, new_pnum, 0, data_size);
if (err) {
mutex_unlock(&ubi->buf_mutex);
err = ubi_io_write_data(ubi, ubi->peb_buf, new_pnum, 0, data_size);
if (err) {
mutex_unlock(&ubi->buf_mutex);
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
goto write_error;
}
goto write_error;
}
@@
-615,7
+615,7
@@
retry:
ubi_free_vid_hdr(ubi, vid_hdr);
vol->eba_tbl[lnum] = new_pnum;
ubi_free_vid_hdr(ubi, vid_hdr);
vol->eba_tbl[lnum] = new_pnum;
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
ubi_wl_put_peb(ubi, vol_id, lnum, pnum, 1);
ubi_msg(ubi, "data was successfully recovered");
ubi_wl_put_peb(ubi, vol_id, lnum, pnum, 1);
ubi_msg(ubi, "data was successfully recovered");
@@
-710,7
+710,7
@@
retry:
if (pnum < 0) {
ubi_free_vid_hdr(ubi, vid_hdr);
leb_write_unlock(ubi, vol_id, lnum);
if (pnum < 0) {
ubi_free_vid_hdr(ubi, vid_hdr);
leb_write_unlock(ubi, vol_id, lnum);
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
return pnum;
}
return pnum;
}
@@
-721,7
+721,7
@@
retry:
if (err) {
ubi_warn(ubi, "failed to write VID header to LEB %d:%d, PEB %d",
vol_id, lnum, pnum);
if (err) {
ubi_warn(ubi, "failed to write VID header to LEB %d:%d, PEB %d",
vol_id, lnum, pnum);
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
goto write_error;
}
goto write_error;
}
@@
-730,13
+730,13
@@
retry:
if (err) {
ubi_warn(ubi, "failed to write %d bytes at offset %d of LEB %d:%d, PEB %d",
len, offset, vol_id, lnum, pnum);
if (err) {
ubi_warn(ubi, "failed to write %d bytes at offset %d of LEB %d:%d, PEB %d",
len, offset, vol_id, lnum, pnum);
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
goto write_error;
}
}
vol->eba_tbl[lnum] = pnum;
goto write_error;
}
}
vol->eba_tbl[lnum] = pnum;
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
leb_write_unlock(ubi, vol_id, lnum);
ubi_free_vid_hdr(ubi, vid_hdr);
leb_write_unlock(ubi, vol_id, lnum);
ubi_free_vid_hdr(ubi, vid_hdr);
@@
-833,7
+833,7
@@
retry:
if (pnum < 0) {
ubi_free_vid_hdr(ubi, vid_hdr);
leb_write_unlock(ubi, vol_id, lnum);
if (pnum < 0) {
ubi_free_vid_hdr(ubi, vid_hdr);
leb_write_unlock(ubi, vol_id, lnum);
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
return pnum;
}
return pnum;
}
@@
-844,7
+844,7
@@
retry:
if (err) {
ubi_warn(ubi, "failed to write VID header to LEB %d:%d, PEB %d",
vol_id, lnum, pnum);
if (err) {
ubi_warn(ubi, "failed to write VID header to LEB %d:%d, PEB %d",
vol_id, lnum, pnum);
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
goto write_error;
}
goto write_error;
}
@@
-852,13
+852,13
@@
retry:
if (err) {
ubi_warn(ubi, "failed to write %d bytes of data to PEB %d",
len, pnum);
if (err) {
ubi_warn(ubi, "failed to write %d bytes of data to PEB %d",
len, pnum);
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
goto write_error;
}
ubi_assert(vol->eba_tbl[lnum] < 0);
vol->eba_tbl[lnum] = pnum;
goto write_error;
}
ubi_assert(vol->eba_tbl[lnum] < 0);
vol->eba_tbl[lnum] = pnum;
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
leb_write_unlock(ubi, vol_id, lnum);
ubi_free_vid_hdr(ubi, vid_hdr);
leb_write_unlock(ubi, vol_id, lnum);
ubi_free_vid_hdr(ubi, vid_hdr);
@@
-953,7
+953,7
@@
retry:
pnum = ubi_wl_get_peb(ubi);
if (pnum < 0) {
err = pnum;
pnum = ubi_wl_get_peb(ubi);
if (pnum < 0) {
err = pnum;
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
goto out_leb_unlock;
}
goto out_leb_unlock;
}
@@
-964,7
+964,7
@@
retry:
if (err) {
ubi_warn(ubi, "failed to write VID header to LEB %d:%d, PEB %d",
vol_id, lnum, pnum);
if (err) {
ubi_warn(ubi, "failed to write VID header to LEB %d:%d, PEB %d",
vol_id, lnum, pnum);
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
goto write_error;
}
goto write_error;
}
@@
-972,13
+972,13
@@
retry:
if (err) {
ubi_warn(ubi, "failed to write %d bytes of data to PEB %d",
len, pnum);
if (err) {
ubi_warn(ubi, "failed to write %d bytes of data to PEB %d",
len, pnum);
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
goto write_error;
}
old_pnum = vol->eba_tbl[lnum];
vol->eba_tbl[lnum] = pnum;
goto write_error;
}
old_pnum = vol->eba_tbl[lnum];
vol->eba_tbl[lnum] = pnum;
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
if (old_pnum >= 0) {
err = ubi_wl_put_peb(ubi, vol_id, lnum, old_pnum, 0);
if (old_pnum >= 0) {
err = ubi_wl_put_peb(ubi, vol_id, lnum, old_pnum, 0);
@@
-1231,9
+1231,9
@@
int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to,
}
ubi_assert(vol->eba_tbl[lnum] == from);
}
ubi_assert(vol->eba_tbl[lnum] == from);
- down_read(&ubi->fm_sem);
+ down_read(&ubi->fm_
eba_
sem);
vol->eba_tbl[lnum] = to;
vol->eba_tbl[lnum] = to;
- up_read(&ubi->fm_sem);
+ up_read(&ubi->fm_
eba_
sem);
out_unlock_buf:
mutex_unlock(&ubi->buf_mutex);
out_unlock_buf:
mutex_unlock(&ubi->buf_mutex);