Merge tag 'x86-urgent-2020-02-09' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / fs / ecryptfs / mmap.c

diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
index cffa0c1ec829356c9114c777b4e6b5d1b444ca1b..019572c6b39ac30bd8ce1982bdec256abd61efa4 100644 (file)
--- a/fs/ecryptfs/mmap.c
+++ b/fs/ecryptfs/mmap.c
@@ -524,16 +524,12 @@ static int ecryptfs_write_end(struct file *file,
 
 static sector_t ecryptfs_bmap(struct address_space *mapping, sector_t block)
 {
-       int rc = 0;
-       struct inode *inode;
-       struct inode *lower_inode;
-
-       inode = (struct inode *)mapping->host;
-       lower_inode = ecryptfs_inode_to_lower(inode);
-       if (lower_inode->i_mapping->a_ops->bmap)
-               rc = lower_inode->i_mapping->a_ops->bmap(lower_inode->i_mapping,
-                                                        block);
-       return rc;
+       struct inode *lower_inode = ecryptfs_inode_to_lower(mapping->host);
+       int ret = bmap(lower_inode, &block);
+
+       if (ret)
+               return 0;
+       return block;
 }
 
 const struct address_space_operations ecryptfs_aops = {