2020-08-21 12:43:17

by Alex Dewar

Subject: [PATCH] btrfs: check return value of filemap_fdatawrite_range()

In btrfs_dio_imap_begin(), filemap_fdatawrite_range() is called without
checking the return value. Add a check to catch errors.

Fixes: c0aaf9b7a114f ("btrfs: switch to iomap_dio_rw() for dio")
Addresses-Coverity: ("Unused value")
Signed-off-by: Alex Dewar <[email protected]>
---
fs/btrfs/inode.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 7b57aaa1f9acc..38fde20b4a81b 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7347,9 +7347,12 @@ static int btrfs_dio_iomap_begin(struct inode *inode, loff_t start,
* outstanding dirty pages are on disk.
*/
if (test_bit(BTRFS_INODE_HAS_ASYNC_EXTENT,
- &BTRFS_I(inode)->runtime_flags))
+ &BTRFS_I(inode)->runtime_flags)) {
ret = filemap_fdatawrite_range(inode->i_mapping, start,
start + length - 1);
+ if (ret)
+ return ret;
+ }

dio_data = kzalloc(sizeof(*dio_data), GFP_NOFS);
if (!dio_data)
--
2.28.0

2020-08-21 14:13:03

by Josef Bacik

Subject: Re: [PATCH] btrfs: check return value of filemap_fdatawrite_range()

On 8/21/20 8:41 AM, Alex Dewar wrote:
> In btrfs_dio_imap_begin(), filemap_fdatawrite_range() is called without
> checking the return value. Add a check to catch errors.
>
> Fixes: c0aaf9b7a114f ("btrfs: switch to iomap_dio_rw() for dio")
> Addresses-Coverity: ("Unused value")
> Signed-off-by: Alex Dewar <[email protected]>
> ---
> fs/btrfs/inode.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index 7b57aaa1f9acc..38fde20b4a81b 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -7347,9 +7347,12 @@ static int btrfs_dio_iomap_begin(struct inode *inode, loff_t start,
> * outstanding dirty pages are on disk.
> */
> if (test_bit(BTRFS_INODE_HAS_ASYNC_EXTENT,
> - &BTRFS_I(inode)->runtime_flags))
> + &BTRFS_I(inode)->runtime_flags)) {
> ret = filemap_fdatawrite_range(inode->i_mapping, start,
> start + length - 1);
> + if (ret)
> + return ret;
> + }
>
> dio_data = kzalloc(sizeof(*dio_data), GFP_NOFS);
> if (!dio_data)
>

Had to check to make sure there's no cleanup that's needed, there isn't,
you can add

Reviewed-by: Josef Bacik <[email protected]>

Thanks,

Josef

2020-08-21 14:40:44

by David Sterba

Subject: Re: [PATCH] btrfs: check return value of filemap_fdatawrite_range()

On Fri, Aug 21, 2020 at 01:41:54PM +0100, Alex Dewar wrote:
> In btrfs_dio_imap_begin(), filemap_fdatawrite_range() is called without
> checking the return value. Add a check to catch errors.
>
> Fixes: c0aaf9b7a114f ("btrfs: switch to iomap_dio_rw() for dio")
> Addresses-Coverity: ("Unused value")
> Signed-off-by: Alex Dewar <[email protected]>

Folded to the patch, thanks.