2022-09-01 03:19:57

by Zhiqiang Liu

Subject: [PATCH v2] xfs: donot need to check return value of xlog_kvmalloc()

In xfs_attri_log_nameval_alloc(), xlog_kvmalloc() is called
to alloc memory, which will always return
successfully, so we donot need to check return value.

Reviewed-by: Eric Sandeen <[email protected]>
Signed-off-by: Zhiqiang Liu <[email protected]>
---
Changelog:
V1 -> V2:
1.add Reviewed-by: Eric Sandeen <[email protected]>
2.remove santity check of xfs_attri_log_nameval_alloc()
suggested by Eric Sandeen.

fs/xfs/xfs_attr_item.c | 6 ------
1 file changed, 6 deletions(-)

diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
index 5077a7ad5646..cf5ce607dc05 100644
--- a/fs/xfs/xfs_attr_item.c
+++ b/fs/xfs/xfs_attr_item.c
@@ -86,8 +86,6 @@ xfs_attri_log_nameval_alloc(
*/
nv = xlog_kvmalloc(sizeof(struct xfs_attri_log_nameval) +
name_len + value_len);
- if (!nv)
- return nv;

nv->name.i_addr = nv + 1;
nv->name.i_len = name_len;
@@ -441,8 +439,6 @@ xfs_attr_create_intent(
attr->xattri_nameval = xfs_attri_log_nameval_alloc(args->name,
args->namelen, args->value, args->valuelen);
}
- if (!attr->xattri_nameval)
- return ERR_PTR(-ENOMEM);

attrip = xfs_attri_init(mp, attr->xattri_nameval);
xfs_trans_add_item(tp, &attrip->attri_item);
@@ -762,8 +758,6 @@ xlog_recover_attri_commit_pass2(
nv = xfs_attri_log_nameval_alloc(attr_name,
attri_formatp->alfi_name_len, attr_value,
attri_formatp->alfi_value_len);
- if (!nv)
- return -ENOMEM;

attrip = xfs_attri_init(mp, nv);
error = xfs_attri_copy_format(&item->ri_buf[0], &attrip->attri_format);
--
2.33.0

2022-09-01 16:47:54

by Darrick J. Wong

Subject: Re: [PATCH v2] xfs: donot need to check return value of xlog_kvmalloc()

On Thu, Sep 01, 2022 at 10:59:08AM +0800, Zhiqiang Liu wrote:
> In xfs_attri_log_nameval_alloc(), xlog_kvmalloc() is called
> to alloc memory, which will always return
> successfully, so we donot need to check return value.
>
> Reviewed-by: Eric Sandeen <[email protected]>
> Signed-off-by: Zhiqiang Liu <[email protected]>

Makes sense...
Reviewed-by: Darrick J. Wong <[email protected]>

--D

> ---
> Changelog:
> V1 -> V2:
> 1.add Reviewed-by: Eric Sandeen <[email protected]>
> 2.remove santity check of xfs_attri_log_nameval_alloc()
> suggested by Eric Sandeen.
>
> fs/xfs/xfs_attr_item.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
> index 5077a7ad5646..cf5ce607dc05 100644
> --- a/fs/xfs/xfs_attr_item.c
> +++ b/fs/xfs/xfs_attr_item.c
> @@ -86,8 +86,6 @@ xfs_attri_log_nameval_alloc(
> */
> nv = xlog_kvmalloc(sizeof(struct xfs_attri_log_nameval) +
> name_len + value_len);
> - if (!nv)
> - return nv;
>
> nv->name.i_addr = nv + 1;
> nv->name.i_len = name_len;
> @@ -441,8 +439,6 @@ xfs_attr_create_intent(
> attr->xattri_nameval = xfs_attri_log_nameval_alloc(args->name,
> args->namelen, args->value, args->valuelen);
> }
> - if (!attr->xattri_nameval)
> - return ERR_PTR(-ENOMEM);
>
> attrip = xfs_attri_init(mp, attr->xattri_nameval);
> xfs_trans_add_item(tp, &attrip->attri_item);
> @@ -762,8 +758,6 @@ xlog_recover_attri_commit_pass2(
> nv = xfs_attri_log_nameval_alloc(attr_name,
> attri_formatp->alfi_name_len, attr_value,
> attri_formatp->alfi_value_len);
> - if (!nv)
> - return -ENOMEM;
>
> attrip = xfs_attri_init(mp, nv);
> error = xfs_attri_copy_format(&item->ri_buf[0], &attrip->attri_format);
> --
> 2.33.0
>