Commit 5591c001 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

Merge remote-tracking branch 'mreitz/tags/pull-block-2017-11-29' into queue-block 



One block patch for 2.11.0-rc3

# gpg: Signature made Wed Nov 29 15:28:38 2017 CET
# gpg:                using RSA key F407DB0061D5CF40
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* mreitz/tags/pull-block-2017-11-29:
  block/nfs: fix nfs_client_open for filesize greater than 1TB

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parents fc24908e f1a7ff77

block/nfs.c

+3 −4
Original line number Diff line number Diff line 
/*

 * QEMU Block driver for native access to files on NFS shares

 *

 * Copyright (c) 2014-2016 Peter Lieven <pl@kamp.de>

 * Copyright (c) 2014-2017 Peter Lieven <pl@kamp.de>

 *

 * Permission is hereby granted, free of charge, to any person obtaining a copy

 * of this software and associated documentation files (the "Software"), to deal
@@ -496,7 +496,7 @@ out: 
static int64_t nfs_client_open(NFSClient *client, QDict *options,

                               int flags, int open_flags, Error **errp)

{

    int ret = -EINVAL;

    int64_t ret = -EINVAL;

    QemuOpts *opts = NULL;

    Error *local_err = NULL;

    struct stat st;
@@ -686,8 +686,7 @@ static QemuOptsList nfs_create_opts = { 


static int nfs_file_create(const char *url, QemuOpts *opts, Error **errp)

{

    int ret = 0;

    int64_t total_size = 0;

    int64_t ret, total_size;

    NFSClient *client = g_new0(NFSClient, 1);

    QDict *options = NULL;