Commit 7752efca authored by Michael Tokarev's avatar Michael Tokarev Committed by Aneesh Kumar K.V
Browse files

9pfs-proxy: tiny cleanups in proxy_pwritev and proxy_preadv 



Don't compare syscall return with -1, use "<0" condition.
Don't introduce useless local variables when we already
have similar variable
Rename local variable to be consistent with other usages
Finally make the two methods, read and write, to be similar to each other

Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
parent 1b6f85e2

hw/9pfs/virtio-9p-proxy.c

+8 −10
Original line number Diff line number Diff line
@@ -693,16 +693,16 @@ static ssize_t proxy_preadv(FsContext *ctx, V9fsFidOpenState *fs, 
                            const struct iovec *iov,

                            int iovcnt, off_t offset)

{

    ssize_t ret;

#ifdef CONFIG_PREADV

    return preadv(fs->fd, iov, iovcnt, offset);

    ret = preadv(fs->fd, iov, iovcnt, offset);

#else

    int err = lseek(fs->fd, offset, SEEK_SET);

    if (err == -1) {

        return err;

    } else {

        return readv(fs->fd, iov, iovcnt);

    ret = lseek(fs->fd, offset, SEEK_SET);

    if (ret >= 0) {

        ret = readv(fs->fd, iov, iovcnt);

    }

#endif

    return ret;

}



static ssize_t proxy_pwritev(FsContext *ctx, V9fsFidOpenState *fs,
@@ -714,10 +714,8 @@ static ssize_t proxy_pwritev(FsContext *ctx, V9fsFidOpenState *fs, 
#ifdef CONFIG_PREADV

    ret = pwritev(fs->fd, iov, iovcnt, offset);

#else

    int err = lseek(fs->fd, offset, SEEK_SET);

    if (err == -1) {

        return err;

    } else {

    ret = lseek(fs->fd, offset, SEEK_SET);

    if (ret >= 0) {

        ret = writev(fs->fd, iov, iovcnt);

    }

#endif