From: yegorslists@googlemail.com
To: barebox@lists.infradead.org
Subject: [PATCH 8/8] fs: ubifs: move file and file_system_type definitions to linux/fs.h
Date: Wed, 27 Jan 2016 12:53:09 +0100 [thread overview]
Message-ID: <1453895589-20941-8-git-send-email-yegorslists@googlemail.com> (raw)
In-Reply-To: <1453895589-20941-1-git-send-email-yegorslists@googlemail.com>
From: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
fs/ubifs/ubifs.h | 39 ---------------------------------------
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 cfd37f2..50ac1c4 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 d0e61ba..e9fb881 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
*/
--
2.1.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2016-01-27 11:54 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-27 11:53 [PATCH 1/8] fs: move PAGE_CACHE definitions to include/linux/pagemap.h yegorslists
2016-01-27 11:53 ` [PATCH 2/8] fs: ubifs: remove redundant macro defines yegorslists
2016-01-27 11:53 ` [PATCH 3/8] fs: use linux/fs.h for file system related definitions yegorslists
2016-01-27 11:53 ` [PATCH 4/8] fs: move pgoff_t definition to include/linux/types.h yegorslists
2016-01-27 11:53 ` [PATCH 5/8] fs: ubifs: move dcache related definitions to include/linux/dcache.h yegorslists
2016-01-27 11:53 ` [PATCH 6/8] fs: ubifs: move vfsmount definition to include/linux/mount.h yegorslists
2016-01-27 11:53 ` [PATCH 7/8] fs: ubifs: move path definition to include/linux/path.h yegorslists
2016-01-27 11:53 ` yegorslists [this message]
2016-01-29 7:08 ` [PATCH 1/8] fs: move PAGE_CACHE definitions to include/linux/pagemap.h Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453895589-20941-8-git-send-email-yegorslists@googlemail.com \
--to=yegorslists@googlemail.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox