Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
[sfrench/cifs-2.6.git] / fs / f2fs / data.c
index da060b77f64d905c828c1ee3bd1ea069fc6c816b..568e1d09eb4864d42ed7ceedec55cb6465b229b2 100644 (file)
@@ -1468,7 +1468,7 @@ next:
        }
 
        if (size) {
-               if (f2fs_encrypted_inode(inode))
+               if (IS_ENCRYPTED(inode))
                        flags |= FIEMAP_EXTENT_DATA_ENCRYPTED;
 
                ret = fiemap_fill_next_extent(fieinfo, logical,
@@ -1739,7 +1739,7 @@ static inline bool check_inplace_update_policy(struct inode *inode,
        if (policy & (0x1 << F2FS_IPU_ASYNC) &&
                        fio && fio->op == REQ_OP_WRITE &&
                        !(fio->op_flags & REQ_SYNC) &&
-                       !f2fs_encrypted_inode(inode))
+                       !IS_ENCRYPTED(inode))
                return true;
 
        /* this is only set during fdatasync */