eventfs: Remove "is_freed" union with rcu head

[platform/kernel/linux-rpi.git] / fs / tracefs / event_inode.c

diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c
index 8c8d64e..a64d8fa 100644 (file)
--- a/fs/tracefs/event_inode.c
+++ b/fs/tracefs/event_inode.c
@@ -38,6 +38,7 @@ struct eventfs_inode {
  * @fop:       file_operations for file or directory
  * @iop:       inode_operations for file or directory
  * @data:      something that the caller will want to get to later on
+ * @is_freed:  Flag set if the eventfs is on its way to be freed
  * @mode:      the permission that the file or directory should have
  */
 struct eventfs_file {
@@ -52,15 +53,14 @@ struct eventfs_file {
         * Union - used for deletion
         * @del_list:   list of eventfs_file to delete
         * @rcu:        eventfs_file to delete in RCU
-        * @is_freed:   node is freed if one of the above is set
         */
        union {
                struct list_head        del_list;
                struct rcu_head         rcu;
-               unsigned long           is_freed;
        };
        void                            *data;
-       umode_t                         mode;
+       unsigned int                    is_freed:1;
+       unsigned int                    mode:31;
 };
 
 static DEFINE_MUTEX(eventfs_mutex);
@@ -814,6 +814,8 @@ static void eventfs_remove_rec(struct eventfs_file *ef, struct list_head *head,
                }
        }
 
+       ef->is_freed = 1;
+
        list_del_rcu(&ef->list);
        list_add_tail(&ef->del_list, head);
 }