nl80211: explicitly check enum nl80211_mesh_power_mode

[cascardo/linux.git] / fs / ext4 / file.c

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index df44c87..261ac37 100644 (file)
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -202,7 +202,7 @@ static int ext4_dax_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
        if (IS_ERR(handle))
                result = VM_FAULT_SIGBUS;
        else
-               result = __dax_fault(vma, vmf, ext4_dax_get_block);
+               result = dax_fault(vma, vmf, ext4_dax_get_block);
 
        if (write) {
                if (!IS_ERR(handle))
@@ -237,7 +237,7 @@ static int ext4_dax_pmd_fault(struct vm_area_struct *vma, unsigned long addr,
        if (IS_ERR(handle))
                result = VM_FAULT_SIGBUS;
        else
-               result = __dax_pmd_fault(vma, addr, pmd, flags,
+               result = dax_pmd_fault(vma, addr, pmd, flags,
                                         ext4_dax_get_block);
 
        if (write) {
@@ -303,10 +303,10 @@ static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma)
        struct inode *inode = file->f_mapping->host;
 
        if (ext4_encrypted_inode(inode)) {
-               int err = ext4_get_encryption_info(inode);
+               int err = fscrypt_get_encryption_info(inode);
                if (err)
                        return 0;
-               if (ext4_encryption_info(inode) == NULL)
+               if (!fscrypt_has_encryption_key(inode))
                        return -ENOKEY;
        }
        file_accessed(file);
@@ -362,16 +362,16 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
                }
        }
        if (ext4_encrypted_inode(inode)) {
-               ret = ext4_get_encryption_info(inode);
+               ret = fscrypt_get_encryption_info(inode);
                if (ret)
                        return -EACCES;
-               if (ext4_encryption_info(inode) == NULL)
+               if (!fscrypt_has_encryption_key(inode))
                        return -ENOKEY;
        }
 
        dir = dget_parent(file_dentry(filp));
        if (ext4_encrypted_inode(d_inode(dir)) &&
-           !ext4_is_child_context_consistent_with_parent(d_inode(dir), inode)) {
+                       !fscrypt_has_permitted_context(d_inode(dir), inode)) {
                ext4_warning(inode->i_sb,
                             "Inconsistent encryption contexts: %lu/%lu",
                             (unsigned long) d_inode(dir)->i_ino,