From: Carlos Maiolino <cmaiolino@redhat.com>
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 [thread overview]
Message-ID: <20181205091728.29903-5-cmaiolino@redhat.com> (raw)
In-Reply-To: <20181205091728.29903-1-cmaiolino@redhat.com>
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 <cmaiolino@redhat.com>
---
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
next prev parent reply other threads:[~2018-12-05 9:18 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-05 9:17 [PATCH 00/10 V2] New ->fiemap infrastructure and ->bmap removal Carlos Maiolino
2018-12-05 9:17 ` [PATCH 01/10] fs: Enable bmap() function to properly return errors Carlos Maiolino
2018-12-05 9:17 ` [PATCH 02/10] cachefiles: drop direct usage of ->bmap method Carlos Maiolino
2018-12-05 9:17 ` [PATCH 03/10] ecryptfs: drop direct calls to ->bmap Carlos Maiolino
2018-12-05 9:17 ` Carlos Maiolino [this message]
2019-01-14 16:49 ` [PATCH 04/10 V2] fibmap: Use bmap instead of ->bmap method in ioctl_fibmap Christoph Hellwig
2019-02-04 11:34 ` Carlos Maiolino
2018-12-05 9:17 ` [PATCH 05/10] fs: Move start and length fiemap fields into fiemap_extent_info Carlos Maiolino
2019-01-14 16:50 ` Christoph Hellwig
2018-12-05 9:17 ` [PATCH 06/10] iomap: Remove length and start fields from iomap_fiemap Carlos Maiolino
2019-01-14 16:51 ` Christoph Hellwig
2018-12-05 9:17 ` [PATCH 07/10] fs: Use a void pointer to store fiemap_extent Carlos Maiolino
2019-01-14 16:53 ` Christoph Hellwig
2018-12-05 9:17 ` [PATCH 08/10 V2] fiemap: Use a callback to fill fiemap extents Carlos Maiolino
2019-01-14 16:53 ` Christoph Hellwig
2018-12-05 9:17 ` [PATCH 09/10 V2] Use FIEMAP for FIBMAP calls Carlos Maiolino
2018-12-05 17:36 ` Darrick J. Wong
2018-12-07 9:09 ` Carlos Maiolino
2018-12-07 20:14 ` Andreas Dilger
2019-02-04 15:11 ` Carlos Maiolino
2019-02-04 18:27 ` Darrick J. Wong
2019-02-06 13:37 ` Carlos Maiolino
2019-02-06 20:44 ` Darrick J. Wong
2019-02-06 21:13 ` Andreas Dilger
2019-02-07 9:52 ` Carlos Maiolino
2019-02-08 8:43 ` Christoph Hellwig
2019-02-11 12:57 ` Christoph Hellwig
2019-02-11 16:21 ` Carlos Maiolino
2019-02-11 16:48 ` Christoph Hellwig
2019-02-07 11:59 ` Carlos Maiolino
2019-02-07 17:02 ` Darrick J. Wong
2019-02-07 21:25 ` Andreas Dilger
2019-02-08 8:46 ` Christoph Hellwig
2019-02-08 10:36 ` Carlos Maiolino
2019-02-08 21:03 ` Andreas Dilger
2019-02-08 9:08 ` Carlos Maiolino
2019-02-08 9:03 ` Carlos Maiolino
2019-02-07 12:36 ` Carlos Maiolino
2019-02-07 18:16 ` Darrick J. Wong
2019-02-08 8:58 ` Carlos Maiolino
2019-02-06 21:04 ` Andreas Dilger
2019-01-14 16:56 ` Christoph Hellwig
2019-02-05 9:56 ` Carlos Maiolino
2019-02-05 18:25 ` Christoph Hellwig
2019-02-06 9:50 ` Carlos Maiolino
2018-12-05 9:17 ` [PATCH 10/10] xfs: Get rid of ->bmap Carlos Maiolino
2018-12-05 17:37 ` Darrick J. Wong
2018-12-06 13:06 ` Carlos Maiolino
2018-12-06 18:56 ` [PATCH 00/10 V2] New ->fiemap infrastructure and ->bmap removal Andreas Grünbacher
2018-12-07 9:34 ` Carlos Maiolino
2019-01-14 16:50 ` Christoph Hellwig
2019-01-14 17:56 ` Andreas Grünbacher
2019-01-14 17:58 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181205091728.29903-5-cmaiolino@redhat.com \
--to=cmaiolino@redhat.com \
--cc=adilger@dilger.ca \
--cc=david@fromorbit.com \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=sandeen@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).