diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-06-14 09:29:53 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-06-14 09:29:53 +0200 |
| commit | 253412624e0fa60a309c6691b0cd99b6c341df87 (patch) | |
| tree | d261ea96f8b29388beb93ec1b05b7b972aa548c1 /include | |
| parent | 6191ef93b25edbd75caec9213db3665f486ee433 (diff) | |
| parent | c35624d1946a4756c93bdb489f4790176b6e2dcc (diff) | |
| download | barebox-253412624e0fa60a309c6691b0cd99b6c341df87.tar.gz barebox-253412624e0fa60a309c6691b0cd99b6c341df87.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'include')
| -rw-r--r-- | include/command.h | 2 | ||||
| -rw-r--r-- | include/driver.h | 12 | ||||
| -rw-r--r-- | include/fs.h | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/include/command.h b/include/command.h index 43ee454f22..0afc5c7550 100644 --- a/include/command.h +++ b/include/command.h @@ -40,7 +40,7 @@ struct string_list; */ struct command { const char *name; /* Command Name */ - const char **aliases; + const char * const *aliases; /* Implementation function */ int (*cmd)(int, char *[]); int (*complete)(struct string_list *sl, char *instr); diff --git a/include/driver.h b/include/driver.h index 52e06f7d62..3d701f2439 100644 --- a/include/driver.h +++ b/include/driver.h @@ -440,7 +440,7 @@ struct file_operations { #define MAX_PARTUUID_STR sizeof("00112233-4455-6677-8899-AABBCCDDEEFF") struct cdev { - struct file_operations *ops; + const struct file_operations *ops; void *priv; struct device_d *dev; struct device_node *device_node; @@ -473,6 +473,8 @@ struct cdev *lcdev_by_name(const char *filename); struct cdev *cdev_readlink(struct cdev *cdev); struct cdev *cdev_by_device_node(struct device_node *node); struct cdev *cdev_open(const char *name, unsigned long flags); +struct cdev *cdev_create_loop(const char *path, ulong flags); +void cdev_remove_loop(struct cdev *cdev); int cdev_do_open(struct cdev *, unsigned long flags); void cdev_close(struct cdev *cdev); int cdev_flush(struct cdev *cdev); @@ -490,6 +492,14 @@ struct cdev *devfs_add_partition(const char *devname, loff_t offset, loff_t size, unsigned int flags, const char *name); int devfs_del_partition(const char *name); +#ifdef CONFIG_FS_AUTOMOUNT +void cdev_create_default_automount(struct cdev *cdev); +#else +static inline void cdev_create_default_automount(struct cdev *cdev) +{ +} +#endif + #define DEVFS_PARTITION_APPEND 0 /** diff --git a/include/fs.h b/include/fs.h index 71edb22f26..d7fa7714b4 100644 --- a/include/fs.h +++ b/include/fs.h @@ -92,6 +92,7 @@ struct fs_device_d { struct fs_driver_d *driver; struct cdev *cdev; + bool loop; char *path; struct device_d *parent_device; struct list_head list; |