Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:60172 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727760AbeJ3WMt (ORCPT ); Tue, 30 Oct 2018 18:12:49 -0400 From: Carlos Maiolino To: linux-fsdevel@vger.kernel.org Cc: sandeen@redhat.com, hch@lst.de, david@fromorbit.com, darrick.wong@oracle.com Subject: [PATCH 16/20] fibmap: Use bmap instead of ->bmap method in ioctl_fibmap Date: Tue, 30 Oct 2018 14:18:19 +0100 Message-Id: <20181030131823.29040-17-cmaiolino@redhat.com> In-Reply-To: <20181030131823.29040-1-cmaiolino@redhat.com> References: <20181030131823.29040-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. Signed-off-by: Carlos Maiolino --- fs/ioctl.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/fs/ioctl.c b/fs/ioctl.c index 85a7aec40e3d..cbc1b21c4f7c 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c @@ -53,19 +53,23 @@ 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, 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(block, p); + if (error) + return error; + + error = bmap(inode, (sector_t *)&block); + if (error) + return error; + + error = put_user(block, p); + + return error; } #define SET_UNKNOWN_FLAGS (FIEMAP_EXTENT_DELALLOC) -- 2.17.1