diff options
| author | Yegor Yefremov <yegorslists@googlemail.com> | 2016-01-27 12:53:09 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-02-01 09:16:13 +0100 |
| commit | 6f332972ef4bcbd6fdfb08d8acd5f8d3f1523176 (patch) | |
| tree | 7d344d50959d2d4d3c7ad244465c7e31607857ac | |
| parent | d20f839037acc9cd0e6c4c3fdfa3b66f695a88a2 (diff) | |
| download | barebox-6f332972ef4bcbd6fdfb08d8acd5f8d3f1523176.tar.gz barebox-6f332972ef4bcbd6fdfb08d8acd5f8d3f1523176.tar.xz | |
fs: ubifs: move file and file_system_type definitions to linux/fs.h
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | fs/ubifs/ubifs.h | 39 | ||||
| -rw-r--r-- | include/linux/fs.h | 39 |
2 files changed, 39 insertions, 39 deletions
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index cfd37f2062..50ac1c4306 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -80,45 +80,6 @@ void iput(struct inode *inode); #define atomic_long_dec(a) #define atomic_long_sub(a, b) -/* linux/include/dcache.h */ - -struct file_system_type { - const char *name; - int fs_flags; - int (*get_sb) (struct file_system_type *, int, - const char *, void *, struct vfsmount *); - void (*kill_sb) (struct super_block *); - struct module *owner; - struct file_system_type * next; - struct list_head fs_supers; -}; - -struct file { - struct path f_path; -#define f_dentry f_path.dentry -#define f_vfsmnt f_path.mnt - const struct file_operations *f_op; - unsigned int f_flags; - loff_t f_pos; - unsigned int f_uid, f_gid; - - u64 f_version; -#ifdef CONFIG_SECURITY - void *f_security; -#endif - /* needed for tty driver, and maybe others */ - void *private_data; - -#ifdef CONFIG_EPOLL - /* Used by fs/eventpoll.c to link all the hooks to this file */ - struct list_head f_ep_links; - spinlock_t f_ep_lock; -#endif /* #ifdef CONFIG_EPOLL */ -#ifdef CONFIG_DEBUG_WRITECOUNT - unsigned long f_mnt_write_state; -#endif -}; - /* * get_seconds() not really needed in the read-only implmentation */ diff --git a/include/linux/fs.h b/include/linux/fs.h index d0e61bab64..e9fb8813ca 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -4,6 +4,8 @@ #include <linux/barebox-wrapper.h> #include <linux/list.h> #include <linux/time.h> +#include <linux/mount.h> +#include <linux/path.h> /* Page cache limit. The filesystems should put that into their s_maxbytes limits, otherwise bad things can happen in VM. */ @@ -176,6 +178,43 @@ struct super_block { char *s_options; }; +struct file_system_type { + const char *name; + int fs_flags; + int (*get_sb) (struct file_system_type *, int, + const char *, void *, struct vfsmount *); + void (*kill_sb) (struct super_block *); + struct module *owner; + struct file_system_type * next; + struct list_head fs_supers; +}; + +struct file { + struct path f_path; +#define f_dentry f_path.dentry +#define f_vfsmnt f_path.mnt + const struct file_operations *f_op; + unsigned int f_flags; + loff_t f_pos; + unsigned int f_uid, f_gid; + + u64 f_version; +#ifdef CONFIG_SECURITY + void *f_security; +#endif + /* needed for tty driver, and maybe others */ + void *private_data; + +#ifdef CONFIG_EPOLL + /* Used by fs/eventpoll.c to link all the hooks to this file */ + struct list_head f_ep_links; + spinlock_t f_ep_lock; +#endif /* #ifdef CONFIG_EPOLL */ +#ifdef CONFIG_DEBUG_WRITECOUNT + unsigned long f_mnt_write_state; +#endif +}; + /* * Inode flags - they have no relation to superblock flags now */ |