diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-04-08 13:37:28 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-04-08 13:37:28 +0200 |
| commit | 5a4379527259d426c2ac8f5f06c358c175a33237 (patch) | |
| tree | 2589a5cc2e223ae7706efb7035ebc729be2738fa /include | |
| parent | 11b2257f4b2c7440925f1c0772905f3c4eea2def (diff) | |
| parent | d43c5b45ab24b9639a103b2ff9d829962c0e472b (diff) | |
| download | barebox-5a4379527259d426c2ac8f5f06c358c175a33237.tar.gz barebox-5a4379527259d426c2ac8f5f06c358c175a33237.tar.xz | |
Merge branch 'for-next/ubiformat'
Diffstat (limited to 'include')
| -rw-r--r-- | include/fs.h | 2 | ||||
| -rw-r--r-- | include/mtd/ubi-user.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/fs.h b/include/fs.h index 9f4164ed77..b9d1e6e09a 100644 --- a/include/fs.h +++ b/include/fs.h @@ -88,6 +88,7 @@ struct fs_driver_d { extern struct list_head fs_device_list; #define for_each_fs_device(f) list_for_each_entry(f, &fs_device_list, list) +#define for_each_fs_device_safe(tmp, f) list_for_each_entry_safe(f, tmp, &fs_device_list, list) extern struct bus_type fs_bus; struct fs_device_d { @@ -143,6 +144,7 @@ int readlink(const char *path, char *buf, size_t bufsiz); int mount (const char *device, const char *fsname, const char *path, const char *fsoptions); int umount(const char *pathname); +int umount_by_cdev(struct cdev *cdev); /* not-so-standard functions */ int erase(int fd, loff_t count, loff_t offset); diff --git a/include/mtd/ubi-user.h b/include/mtd/ubi-user.h index 2000ef2fd0..8c02f96e4c 100644 --- a/include/mtd/ubi-user.h +++ b/include/mtd/ubi-user.h @@ -406,6 +406,7 @@ struct ubi_set_vol_prop_req { int ubi_attach_mtd_dev(struct mtd_info *mtd, int ubi_num, int vid_hdr_offset, int max_beb_per1024); -int ubi_detach_mtd_dev(int ubi_num, int anyway); +int ubi_detach(int ubi_num); +int ubi_num_get_by_mtd(struct mtd_info *mtd); #endif /* __UBI_USER_H__ */ |