[PATCH 2/8] fs: drop ifdefs in linux/fs.h

[Ahmad Fatoum]

We are not going to implement epoll or DAX any time soon, so let's
clean up that #ifdef hidden dead code.

Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
 include/linux/fs.h | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/include/linux/fs.h b/include/linux/fs.h
index b1161c4a881f..353e2a359d24 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -171,9 +171,6 @@ struct super_block {
 	int			s_count;
 	int			s_syncing;
 	int			s_need_sync_fs;
-#ifdef CONFIG_SECURITY
-	void                    *s_security;
-#endif
 	struct xattr_handler	**s_xattr;
 
 	struct list_head	s_inodes;	/* all inodes */
@@ -234,20 +231,8 @@ struct file {
 	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
 };
 
 struct super_operations {
@@ -276,11 +261,7 @@ static inline struct inode *file_inode(const struct file *f)
 #define S_IMA		1024	/* Inode has an associated IMA struct */
 #define S_AUTOMOUNT	2048	/* Automount/referral quasi-directory */
 #define S_NOSEC		4096	/* no suid or xattr security attributes */
-#ifdef CONFIG_FS_DAX
-#define S_DAX		8192	/* Direct Access, avoiding the page cache */
-#else
 #define S_DAX		0	/* Make all the DAX code disappear */
-#endif
 
 /*
  * Note that nosuid etc flags are inode-specific: setting some file-system
-- 
2.39.5