| Message ID | 20220608021252.990374-1-weiyongjun1@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-next] btrfs: sysfs: fix return value check in btrfs_force_chunk_alloc_s() | expand |
On Wed, Jun 08, 2022 at 02:12:52AM +0000, Wei Yongjun wrote: > In case of error, the function btrfs_start_transaction() returns > ERR_PTR() and never returns NULL. The NULL test in the return value > check should be replaced with IS_ERR(). > > Fixes: 46e1bce0ac34 ("btrfs: sysfs: add force_chunk_alloc trigger to force allocation") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Thanks, fix folded to the patch as it's still in the development branch.
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c index ebe76d7a4a64..4186fdcbcdee 100644 --- a/fs/btrfs/sysfs.c +++ b/fs/btrfs/sysfs.c @@ -807,7 +807,7 @@ static ssize_t btrfs_force_chunk_alloc_store(struct kobject *kobj, * unexpected problems. */ trans = btrfs_start_transaction(fs_info->tree_root, 0); - if (!trans) + if (IS_ERR(trans)) return PTR_ERR(trans); ret = btrfs_force_chunk_alloc(trans, space_info->flags); btrfs_end_transaction(trans);
In case of error, the function btrfs_start_transaction() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: 46e1bce0ac34 ("btrfs: sysfs: add force_chunk_alloc trigger to force allocation") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- fs/btrfs/sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)