Re: [PATCH 2/3] xfs: fix xfs_reflink_remap_prep calling conventions

Brian Foster
2020-06-24T12:38:56Z

On Mon, Jun 22, 2020 at 09:01:42PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Fix the return value of xfs_reflink_remap_prep so that its return value
> conventions match the rest of xfs.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---

Reviewed-by: Brian Foster <bfoster@redhat.com>

> fs/xfs/xfs_file.c | 2 +-
> fs/xfs/xfs_reflink.c | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
> index 00db81eac80d..b375fae811f2 100644
> --- a/fs/xfs/xfs_file.c
> +++ b/fs/xfs/xfs_file.c
> @@ -1035,7 +1035,7 @@ xfs_file_remap_range(
> /* Prepare and then clone file data. */
> ret = xfs_reflink_remap_prep(file_in, pos_in, file_out, pos_out,
> &len, remap_flags);
> - if (ret < 0 || len == 0)
> + if (ret || len == 0)
> return ret;
>
> trace_xfs_reflink_remap_range(src, pos_in, len, dest, pos_out);
> diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
> index f50a8c2f21a5..dd9ed7d5694d 100644
> --- a/fs/xfs/xfs_reflink.c
> +++ b/fs/xfs/xfs_reflink.c
> @@ -1341,7 +1341,7 @@ xfs_reflink_remap_prep(
> struct inode *inode_out = file_inode(file_out);
> struct xfs_inode *dest = XFS_I(inode_out);
> bool same_inode = (inode_in == inode_out);
> - ssize_t ret;
> + int ret;
>
> /* Lock both files against IO */
> ret = xfs_iolock_two_inodes_and_break_layout(inode_in, inode_out);
> @@ -1365,7 +1365,7 @@ xfs_reflink_remap_prep(
>
> ret = generic_remap_file_range_prep(file_in, pos_in, file_out, pos_out,
> len, remap_flags);
> - if (ret < 0 || *len == 0)
> + if (ret || *len == 0)
> goto out_unlock;
>
> /* Attach dquots to dest inode before changing block map */
> @@ -1400,7 +1400,7 @@ xfs_reflink_remap_prep(
> if (ret)
> goto out_unlock;
>
> - return 1;
> + return 0;
> out_unlock:
> xfs_reflink_remap_unlock(file_in, file_out);
> return ret;
>