Commit 1486df0e authored by Denis V. Lunev's avatar Denis V. Lunev Committed by Kevin Wolf
Browse files

block/raw-posix: create translate_err helper to merge errno values 



actually the code
    if (ret == -ENODEV || ret == -ENOSYS || ret == -EOPNOTSUPP ||
        ret == -ENOTTY) {
        ret = -ENOTSUP;
    }
is present twice and will be added a couple more times. Create helper
for this.

CC: Kevin Wolf <kwolf@redhat.com>
CC: Stefan Hajnoczi <stefanha@redhat.com>
CC: Peter Lieven <pl@kamp.de>
CC: Fam Zheng <famz@redhat.com>
Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarPeter Lieven <pl@kamp.de>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent a71754e5

block/raw-posix.c

+13 −6
Original line number Diff line number Diff line
@@ -893,6 +893,15 @@ static int xfs_discard(BDRVRawState *s, int64_t offset, uint64_t bytes) 
}

#endif



static int translate_err(int err)

{

    if (err == -ENODEV || err == -ENOSYS || err == -EOPNOTSUPP ||

        err == -ENOTTY) {

        err = -ENOTSUP;

    }

    return err;

}



static ssize_t handle_aiocb_write_zeroes(RawPosixAIOData *aiocb)

{

    int ret = -EOPNOTSUPP;
@@ -921,10 +930,9 @@ static ssize_t handle_aiocb_write_zeroes(RawPosixAIOData *aiocb) 
#endif

    }



    if (ret == -ENODEV || ret == -ENOSYS || ret == -EOPNOTSUPP ||

        ret == -ENOTTY) {

    ret = translate_err(ret);

    if (ret == -ENOTSUP) {

        s->has_write_zeroes = false;

        ret = -ENOTSUP;

    }

    return ret;

}
@@ -968,10 +976,9 @@ static ssize_t handle_aiocb_discard(RawPosixAIOData *aiocb) 
#endif

    }



    if (ret == -ENODEV || ret == -ENOSYS || ret == -EOPNOTSUPP ||

        ret == -ENOTTY) {

    ret = translate_err(ret);

    if (ret == -ENOTSUP) {

        s->has_discard = false;

        ret = -ENOTSUP;

    }

    return ret;

}