On 2018年01月11日 00:55, Josef Bacik wrote: > From: Josef Bacik <jbacik@xxxxxx> > > My delayed refs rsv patches uncovered a problem in > btrfs_alloc_data_chunk_ondemand where we don't clear ret before > returning, so we could have whatever left over value we had from trying > to do a chunk allocation or whatever that may have failed. Since we > know we've succeeded at this point just unconditionally return 0. This > fixed the xfstests failures I was seeing with my delayed refs rsv > patches. > > Signed-off-by: Josef Bacik <jbacik@xxxxxx> Reviewed-by: Qu Wenruo <wqu@xxxxxxxx> The branch to leave ret = 1 would be the "ret = do_chunk_alloc()" call, which could return 1, and goes to final return. So the fix is good. Thanks, Qu > --- > fs/btrfs/extent-tree.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c > index dbae25d882de..33c9efbfc9a7 100644 > --- a/fs/btrfs/extent-tree.c > +++ b/fs/btrfs/extent-tree.c > @@ -4387,8 +4387,7 @@ int btrfs_alloc_data_chunk_ondemand(struct btrfs_inode *inode, u64 bytes) > trace_btrfs_space_reservation(fs_info, "space_info", > data_sinfo->flags, bytes, 1); > spin_unlock(&data_sinfo->lock); > - > - return ret; > + return 0; > } > > int btrfs_check_data_free_space(struct inode *inode, >
Attachment:
signature.asc
Description: OpenPGP digital signature
