From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx3-rdu2.redhat.com ([66.187.233.73]:44534 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726491AbeILRaS (ORCPT ); Wed, 12 Sep 2018 13:30:18 -0400 From: Carlos Maiolino To: linux-fsdevel@vger.kernel.org Cc: hch@lst.de, sandeen@redhat.com, david@fromorbit.com Subject: [PATCH 3/3] ecryptfs: drop direct calls to ->bmap Date: Wed, 12 Sep 2018 14:25:36 +0200 Message-Id: <20180912122536.31977-4-cmaiolino@redhat.com> In-Reply-To: <20180912122536.31977-1-cmaiolino@redhat.com> References: <20180912122536.31977-1-cmaiolino@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Replace direct ->bmap calls by bmap() method. Signed-off-by: Carlos Maiolino --- fs/ecryptfs/mmap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c index cdf358b209d9..256721eb6a03 100644 --- a/fs/ecryptfs/mmap.c +++ b/fs/ecryptfs/mmap.c @@ -538,16 +538,17 @@ static int ecryptfs_write_end(struct file *file, static sector_t ecryptfs_bmap(struct address_space *mapping, sector_t block) { - int rc = 0; + sector_t blk_map = 0; + int ret; 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; + + ret = bmap(lower_inode, &blk_map); + + return !ret ? blk_map : 0; } const struct address_space_operations ecryptfs_aops = { -- 2.14.4