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

Commit 518ceef0 authored by Dmitry Pervushin's avatar Dmitry Pervushin Committed by Artem Bityutskiy
Browse files

UBI: remove built-in gluebi 



Remove built-in gluebi support. This is a preparation for a
standalone glubi module support

Signed-off-by: default avatarDmitry Pervushin <dpervushin@embeddedalley.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 0e0ee1cc

drivers/mtd/ubi/cdev.c

+0 −1
Original line number Diff line number Diff line
@@ -395,7 +395,6 @@ static ssize_t vol_cdev_write(struct file *file, const char __user *buf, 
			vol->corrupted = 1;

		}

		vol->checked = 1;

		ubi_gluebi_updated(vol);

		ubi_volume_notify(ubi, vol, UBI_VOLUME_UPDATED);

		revoke_exclusive(desc, UBI_READWRITE);

	}

drivers/mtd/ubi/ubi.h

+0 −26
Original line number Diff line number Diff line
@@ -231,10 +231,6 @@ struct ubi_volume_desc; 
 * @changing_leb: %1 if the atomic LEB change ioctl command is in progress

 * @direct_writes: %1 if direct writes are enabled for this volume

 *

 * @gluebi_desc: gluebi UBI volume descriptor

 * @gluebi_refcount: reference count of the gluebi MTD device

 * @gluebi_mtd: MTD device description object of the gluebi MTD device

 *

 * The @corrupted field indicates that the volume's contents is corrupted.

 * Since UBI protects only static volumes, this field is not relevant to

 * dynamic volumes - it is user's responsibility to assure their data
@@ -278,17 +274,6 @@ struct ubi_volume { 
	unsigned int updating:1;

	unsigned int changing_leb:1;

	unsigned int direct_writes:1;



#ifdef CONFIG_MTD_UBI_GLUEBI

	/*

	 * Gluebi-related stuff may be compiled out.

	 * Note: this should not be built into UBI but should be a separate

	 * ubimtd driver which works on top of UBI and emulates MTD devices.

	 */

	struct ubi_volume_desc *gluebi_desc;

	int gluebi_refcount;

	struct mtd_info gluebi_mtd;

#endif

};



/**
@@ -517,17 +502,6 @@ int ubi_calc_data_len(const struct ubi_device *ubi, const void *buf, 
int ubi_check_volume(struct ubi_device *ubi, int vol_id);

void ubi_calculate_reserved(struct ubi_device *ubi);



/* gluebi.c */

#ifdef CONFIG_MTD_UBI_GLUEBI

int ubi_create_gluebi(struct ubi_device *ubi, struct ubi_volume *vol);

int ubi_destroy_gluebi(struct ubi_volume *vol);

void ubi_gluebi_updated(struct ubi_volume *vol);

#else

#define ubi_create_gluebi(ubi, vol) 0

#define ubi_destroy_gluebi(vol) 0

#define ubi_gluebi_updated(vol)

#endif



/* eba.c */

int ubi_eba_unmap_leb(struct ubi_device *ubi, struct ubi_volume *vol,

		      int lnum);

drivers/mtd/ubi/vmt.c

+2 −24
Original line number Diff line number Diff line
@@ -317,10 +317,6 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req) 
		goto out_mapping;

	}



	err = ubi_create_gluebi(ubi, vol);

	if (err)

		goto out_cdev;



	vol->dev.release = vol_release;

	vol->dev.parent = &ubi->dev;

	vol->dev.devt = dev;
@@ -330,7 +326,7 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req) 
	err = device_register(&vol->dev);

	if (err) {

		ubi_err("cannot register device");

		goto out_gluebi;

		goto out_cdev;

	}



	err = volume_sysfs_init(ubi, vol);
@@ -375,10 +371,6 @@ int ubi_create_volume(struct ubi_device *ubi, struct ubi_mkvol_req *req) 
	do_free = 0;

	get_device(&vol->dev);

	volume_sysfs_close(vol);

out_gluebi:

	if (ubi_destroy_gluebi(vol))

		dbg_err("cannot destroy gluebi for volume %d:%d",

			ubi->ubi_num, vol_id);

out_cdev:

	cdev_del(&vol->cdev);

out_mapping:
@@ -433,10 +425,6 @@ int ubi_remove_volume(struct ubi_volume_desc *desc, int no_vtbl) 
	ubi->volumes[vol_id] = NULL;

	spin_unlock(&ubi->volumes_lock);



	err = ubi_destroy_gluebi(vol);

	if (err)

		goto out_err;



	if (!no_vtbl) {

		err = ubi_change_vtbl_record(ubi, vol_id, NULL);

		if (err)
@@ -674,10 +662,6 @@ int ubi_add_volume(struct ubi_device *ubi, struct ubi_volume *vol) 
		return err;

	}



	err = ubi_create_gluebi(ubi, vol);

	if (err)

		goto out_cdev;



	vol->dev.release = vol_release;

	vol->dev.parent = &ubi->dev;

	vol->dev.devt = dev;
@@ -685,12 +669,11 @@ int ubi_add_volume(struct ubi_device *ubi, struct ubi_volume *vol) 
	dev_set_name(&vol->dev, "%s_%d", ubi->ubi_name, vol->vol_id);

	err = device_register(&vol->dev);

	if (err)

		goto out_gluebi;

		goto out_cdev;



	err = volume_sysfs_init(ubi, vol);

	if (err) {

		cdev_del(&vol->cdev);

		err = ubi_destroy_gluebi(vol);

		volume_sysfs_close(vol);

		return err;

	}
@@ -699,8 +682,6 @@ int ubi_add_volume(struct ubi_device *ubi, struct ubi_volume *vol) 
		dbg_err("check failed while adding volume %d", vol_id);

	return err;



out_gluebi:

	err = ubi_destroy_gluebi(vol);

out_cdev:

	cdev_del(&vol->cdev);

	return err;
@@ -716,12 +697,9 @@ int ubi_add_volume(struct ubi_device *ubi, struct ubi_volume *vol) 
 */

void ubi_free_volume(struct ubi_device *ubi, struct ubi_volume *vol)

{

	int err;



	dbg_gen("free volume %d", vol->vol_id);



	ubi->volumes[vol->vol_id] = NULL;

	err = ubi_destroy_gluebi(vol);

	cdev_del(&vol->cdev);

	volume_sysfs_close(vol);

}