Merge tag 'for-5.11/block-2020-12-14' of git://git.kernel.dk/linux-block

[platform/kernel/linux-starfive.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index b0b3583..59bba64 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -922,7 +922,7 @@ struct file {
        const struct file_operations    *f_op;
 
        /*
-        * Protects f_ep_links, f_flags.
+        * Protects f_ep, f_flags.
         * Must not be taken from IRQ context.
         */
        spinlock_t              f_lock;
@@ -945,8 +945,7 @@ struct file {
 
 #ifdef CONFIG_EPOLL
        /* Used by fs/eventpoll.c to link all the hooks to this file */
-       struct list_head        f_ep_links;
-       struct list_head        f_tfile_llink;
+       struct hlist_head       *f_ep;
 #endif /* #ifdef CONFIG_EPOLL */
        struct address_space    *f_mapping;
        errseq_t                f_wb_err;
@@ -3227,7 +3226,7 @@ static inline bool vma_is_fsdax(struct vm_area_struct *vma)
 {
        struct inode *inode;
 
-       if (!vma->vm_file)
+       if (!IS_ENABLED(CONFIG_FS_DAX) || !vma->vm_file)
                return false;
        if (!vma_is_dax(vma))
                return false;