hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UBI: get device when opening volume 

When a volume is opened, get its kref via get_device() call.
And put the reference when closing the volume. With this, we
may have a bit saner volume delete.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
Artem Bityutskiy 2007-12-17 13:09:09 +02:00
parent c63a491d37
commit 450f872a8e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mtd/ubi/cdev.c
View File

@ -635,9 +635,12 @@ static int ubi_cdev_ioctl(struct inode *inode, struct file *file,
} }
err = ubi_remove_volume(desc); err = ubi_remove_volume(desc);
if (err) /*
ubi_close_volume(desc); * The volume is deleted, and the 'struct ubi_volume' object
* will be freed when 'ubi_close_volume()' will call
* 'put_device()'.
*/
ubi_close_volume(desc);
break; break;
} }

2
drivers/mtd/ubi/kapi.c
View File

@ -156,6 +156,7 @@ struct ubi_volume_desc *ubi_open_volume(int ubi_num, int vol_id, int mode)
vol->exclusive = 1; vol->exclusive = 1;
break; break;
} }
get_device(&vol->dev);
spin_unlock(&ubi->volumes_lock); spin_unlock(&ubi->volumes_lock);
desc->vol = vol; desc->vol = vol;
@ -274,6 +275,7 @@ void ubi_close_volume(struct ubi_volume_desc *desc)
spin_unlock(&vol->ubi->volumes_lock); spin_unlock(&vol->ubi->volumes_lock);
kfree(desc); kfree(desc);
put_device(&vol->dev);
module_put(THIS_MODULE); module_put(THIS_MODULE);
} }
EXPORT_SYMBOL_GPL(ubi_close_volume); EXPORT_SYMBOL_GPL(ubi_close_volume);

5
drivers/mtd/ubi/vmt.c
View File

@ -435,7 +435,6 @@ int ubi_remove_volume(struct ubi_volume_desc *desc)
vol->eba_tbl = NULL; vol->eba_tbl = NULL;
cdev_del(&vol->cdev); cdev_del(&vol->cdev);
volume_sysfs_close(vol); volume_sysfs_close(vol);
kfree(desc);
spin_lock(&ubi->volumes_lock); spin_lock(&ubi->volumes_lock);
ubi->rsvd_pebs -= reserved_pebs; ubi->rsvd_pebs -= reserved_pebs;
@ -453,10 +452,6 @@ int ubi_remove_volume(struct ubi_volume_desc *desc)
spin_unlock(&ubi->volumes_lock); spin_unlock(&ubi->volumes_lock);
paranoid_check_volumes(ubi); paranoid_check_volumes(ubi);
mutex_unlock(&ubi->volumes_mutex);
module_put(THIS_MODULE);
return 0;
out: out:
mutex_unlock(&ubi->volumes_mutex); mutex_unlock(&ubi->volumes_mutex);
return err; return err;