From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:13096 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726351AbeLEJSC (ORCPT ); Wed, 5 Dec 2018 04:18:02 -0500 From: Carlos Maiolino To: linux-fsdevel@vger.kernel.org Cc: hch@lst.de, adilger@dilger.ca, sandeen@redhat.com, david@fromorbit.com Subject: [PATCH 04/10 V2] fibmap: Use bmap instead of ->bmap method in ioctl_fibmap Date: Wed, 5 Dec 2018 10:17:22 +0100 Message-Id: <20181205091728.29903-5-cmaiolino@redhat.com> In-Reply-To: <20181205091728.29903-1-cmaiolino@redhat.com> References: <20181205091728.29903-1-cmaiolino@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: Now we have the possibility of proper error return in bmap, use bmap() function in ioctl_fibmap() instead of calling ->bmap method directly. V2: - Use a local sector_t variable to asign the block number instead of using direct casting. Signed-off-by: Carlos Maiolino --- fs/ioctl.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/fs/ioctl.c b/fs/ioctl.c index d64f622cac8b..e0cc0dd5f9aa 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c @@ -53,19 +53,26 @@ EXPORT_SYMBOL(vfs_ioctl); static int ioctl_fibmap(struct file *filp, int __user *p) { - struct address_space *mapping = filp->f_mapping; - int res, block; + struct inode *inode = file_inode(filp); + int error, usr_blk; + sector_t block; - /* do we support this mess? */ - if (!mapping->a_ops->bmap) - return -EINVAL; if (!capable(CAP_SYS_RAWIO)) return -EPERM; - res = get_user(block, p); - if (res) - return res; - res = mapping->a_ops->bmap(mapping, block); - return put_user(res, p); + + error = get_user(usr_blk, p); + if (error) + return error; + + block = usr_blk; + error = bmap(inode, &block); + if (error) + return error; + usr_blk = block; + + error = put_user(usr_blk, p); + + return error; } /** -- 2.17.2