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

UBI: Export next_sqnum() 



Fastmap needs next_sqnum(), rename it to ubi_next_sqnum()
and make it non-static.

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

drivers/mtd/ubi/eba.c

+9 −9
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ 
 * global sequence counter value. It also increases the global sequence

 * global sequence counter value. It also increases the global sequence

 * counter.

 * counter.

 */

 */

static unsigned long long next_sqnum(struct ubi_device *ubi)

unsigned long long ubi_next_sqnum(struct ubi_device *ubi)

{

{

	unsigned long long sqnum;

	unsigned long long sqnum;
@@ -521,7 +521,7 @@ static int recover_peb(struct ubi_device *ubi, int pnum, int vol_id, int lnum, 
		goto out_put;

		goto out_put;

	}

	}





	vid_hdr->sqnum = cpu_to_be64(next_sqnum(ubi));

	vid_hdr->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));

	err = ubi_io_write_vid_hdr(ubi, new_pnum, vid_hdr);

	err = ubi_io_write_vid_hdr(ubi, new_pnum, vid_hdr);

	if (err)

	if (err)

		goto write_error;

		goto write_error;
@@ -632,7 +632,7 @@ int ubi_eba_write_leb(struct ubi_device *ubi, struct ubi_volume *vol, int lnum, 
	}

	}





	vid_hdr->vol_type = UBI_VID_DYNAMIC;

	vid_hdr->vol_type = UBI_VID_DYNAMIC;

	vid_hdr->sqnum = cpu_to_be64(next_sqnum(ubi));

	vid_hdr->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));

	vid_hdr->vol_id = cpu_to_be32(vol_id);

	vid_hdr->vol_id = cpu_to_be32(vol_id);

	vid_hdr->lnum = cpu_to_be32(lnum);

	vid_hdr->lnum = cpu_to_be32(lnum);

	vid_hdr->compat = ubi_get_compat(ubi, vol_id);

	vid_hdr->compat = ubi_get_compat(ubi, vol_id);
@@ -692,7 +692,7 @@ int ubi_eba_write_leb(struct ubi_device *ubi, struct ubi_volume *vol, int lnum, 
		return err;

		return err;

	}

	}





	vid_hdr->sqnum = cpu_to_be64(next_sqnum(ubi));

	vid_hdr->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));

	ubi_msg("try another PEB");

	ubi_msg("try another PEB");

	goto retry;

	goto retry;

}

}
@@ -745,7 +745,7 @@ int ubi_eba_write_leb_st(struct ubi_device *ubi, struct ubi_volume *vol, 
		return err;

		return err;

	}

	}





	vid_hdr->sqnum = cpu_to_be64(next_sqnum(ubi));

	vid_hdr->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));

	vid_hdr->vol_id = cpu_to_be32(vol_id);

	vid_hdr->vol_id = cpu_to_be32(vol_id);

	vid_hdr->lnum = cpu_to_be32(lnum);

	vid_hdr->lnum = cpu_to_be32(lnum);

	vid_hdr->compat = ubi_get_compat(ubi, vol_id);

	vid_hdr->compat = ubi_get_compat(ubi, vol_id);
@@ -810,7 +810,7 @@ int ubi_eba_write_leb_st(struct ubi_device *ubi, struct ubi_volume *vol, 
		return err;

		return err;

	}

	}





	vid_hdr->sqnum = cpu_to_be64(next_sqnum(ubi));

	vid_hdr->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));

	ubi_msg("try another PEB");

	ubi_msg("try another PEB");

	goto retry;

	goto retry;

}

}
@@ -862,7 +862,7 @@ int ubi_eba_atomic_leb_change(struct ubi_device *ubi, struct ubi_volume *vol, 
	if (err)

	if (err)

		goto out_mutex;

		goto out_mutex;





	vid_hdr->sqnum = cpu_to_be64(next_sqnum(ubi));

	vid_hdr->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));

	vid_hdr->vol_id = cpu_to_be32(vol_id);

	vid_hdr->vol_id = cpu_to_be32(vol_id);

	vid_hdr->lnum = cpu_to_be32(lnum);

	vid_hdr->lnum = cpu_to_be32(lnum);

	vid_hdr->compat = ubi_get_compat(ubi, vol_id);

	vid_hdr->compat = ubi_get_compat(ubi, vol_id);
@@ -930,7 +930,7 @@ int ubi_eba_atomic_leb_change(struct ubi_device *ubi, struct ubi_volume *vol, 
		goto out_leb_unlock;

		goto out_leb_unlock;

	}

	}





	vid_hdr->sqnum = cpu_to_be64(next_sqnum(ubi));

	vid_hdr->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));

	ubi_msg("try another PEB");

	ubi_msg("try another PEB");

	goto retry;

	goto retry;

}

}
@@ -1089,7 +1089,7 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to, 
		vid_hdr->data_size = cpu_to_be32(data_size);

		vid_hdr->data_size = cpu_to_be32(data_size);

		vid_hdr->data_crc = cpu_to_be32(crc);

		vid_hdr->data_crc = cpu_to_be32(crc);

	}

	}

	vid_hdr->sqnum = cpu_to_be64(next_sqnum(ubi));

	vid_hdr->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));





	err = ubi_io_write_vid_hdr(ubi, to, vid_hdr);

	err = ubi_io_write_vid_hdr(ubi, to, vid_hdr);

	if (err) {

	if (err) {