Commit 569d2056 authored by Carlos Maiolino's avatar Carlos Maiolino Committed by Al Viro
Browse files

ecryptfs: drop direct calls to ->bmap 



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

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 10d83e11

fs/ecryptfs/mmap.c

+6 −10
Original line number Diff line number Diff line
@@ -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 = {