ecryptfs: drop direct calls to ->bmap

Replace direct ->bmap calls by bmap() method.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Carlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
index cffa0c1..019572c 100644 (file)
--- a/fs/ecryptfs/mmap.c
+++ b/fs/ecryptfs/mmap.c
@@ -524,16 +524,12 @@ out:
 
 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 = {