[Qemu-commits] [qemu/qemu] 055c6f: block/nfs: fix calculation of allocated file size

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 055c6f912c8d3cd9a901972ae432c47e5872f71a
      
https://github.com/qemu/qemu/commit/055c6f912c8d3cd9a901972ae432c47e5872f71a
  Author: Peter Lieven <address@hidden>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M block/nfs.c

  Log Message:
  -----------
  block/nfs: fix calculation of allocated file size

st.st_blocks is always counted in 512 byte units. Do not
use st.st_blksize as multiplicator which may be larger.

Cc: address@hidden
Signed-off-by: Peter Lieven <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 18a8056e0bc744e5dd2bb5cb998423b607d99f19
      
https://github.com/qemu/qemu/commit/18a8056e0bc744e5dd2bb5cb998423b607d99f19
  Author: Peter Lieven <address@hidden>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M block/nfs.c

  Log Message:
  -----------
  block/nfs: cache allocated filesize for read-only files

If the file is readonly its not expected to grow so
save the blocking call to nfs_fstat_async and use
the value saved at connection time. Also important
the monitor (and thus the main loop) will not hang
if block device info is queried and the NFS share
is unresponsive.

Signed-off-by: Peter Lieven <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 4da65c80921139f3e0ff63f5ea20c5d9c778364f
      
https://github.com/qemu/qemu/commit/4da65c80921139f3e0ff63f5ea20c5d9c778364f
  Author: Liu Yuan <address@hidden>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: add reopen support

With reopen supported, block-commit (and offline commit) is now supported for
image files whose base image uses the Sheepdog protocol driver.

Cc: address@hidden
Cc: Jeff Cody <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: Liu Yuan <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 9568b511c9f91c3d21ea3e83426d4ee7168c98bb
      
https://github.com/qemu/qemu/commit/9568b511c9f91c3d21ea3e83426d4ee7168c98bb
  Author: Wen Congyang <address@hidden>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M block/io.c
    M include/block/block.h
    M trace-events

  Log Message:
  -----------
  block: Introduce a new API bdrv_co_no_copy_on_readv()

In some cases, we need to disable copy-on-read, and just
read the data.

Signed-off-by: Wen Congyang <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 06c3916b35a1cf6db548450a0cfb96983c33c82f
      
https://github.com/qemu/qemu/commit/06c3916b35a1cf6db548450a0cfb96983c33c82f
  Author: Wen Congyang <address@hidden>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M block/backup.c

  Log Message:
  -----------
  Backup: don't do copy-on-read in before_write_notifier

We will copy data in before_write_notifier to do backup.
It is a nested I/O request, so we cannot do copy-on-read.

The steps to reproduce it:
1. -drive copy-on-read=on,...  // qemu option
2. drive_backup -f disk0 /path_to_backup.img // monitor command

Signed-off-by: Wen Congyang <address@hidden>
Tested-by: Jeff Cody <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 498f21405a286f718a0767c791b7d2db19f4e5bd
      
https://github.com/qemu/qemu/commit/498f21405a286f718a0767c791b7d2db19f4e5bd
  Author: Hitoshi Mitake <address@hidden>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: use per AIOCB dirty indexes for non overlapping requests

In the commit 96b14ff85acf, requests for overlapping areas are
serialized. However, it cannot handle a case of non overlapping
requests. In such a case, min_dirty_data_idx and max_dirty_data_idx
can be overwritten by the requests and invalid inode update can
happen e.g. a case like create(1, 2) and create(3, 4) are issued in
parallel.

This patch lets SheepdogAIOCB have dirty data indexes instead of
BDRVSheepdogState for avoiding the above situation.

This patch also does trivial renaming for better description:
overwrapping -> overlapping

Cc: Teruaki Ishizaki <address@hidden>
Cc: Vasiliy Tolstov <address@hidden>
Cc: Jeff Cody <address@hidden>
Signed-off-by: Hitoshi Mitake <address@hidden>
Tested-by: Vasiliy Tolstov <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: e6fd57ea297ec3aad32b24090c5d3757a99df3fe
      
https://github.com/qemu/qemu/commit/e6fd57ea297ec3aad32b24090c5d3757a99df3fe
  Author: Hitoshi Mitake <address@hidden>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  sheepdog: refine discard support

This patch refines discard support of the sheepdog driver. The
existing discard mechanism was implemented on SD_OP_DISCARD_OBJ, which
was introduced before fine grained reference counting on newer
sheepdog. It doesn't care about relations of snapshots and clones and
discards objects unconditionally.

With this patch, the driver just updates an inode object for updating
reference. Removing the object is done in sheep process side.

Cc: Teruaki Ishizaki <address@hidden>
Cc: Vasiliy Tolstov <address@hidden>
Cc: Jeff Cody <address@hidden>
Signed-off-by: Hitoshi Mitake <address@hidden>
Tested-by: Vasiliy Tolstov <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 54b376230c795d9f63490fa2e951cb786f7b1e12
      
https://github.com/qemu/qemu/commit/54b376230c795d9f63490fa2e951cb786f7b1e12
  Author: Peter Maydell <address@hidden>
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
    M block/backup.c
    M block/io.c
    M block/nfs.c
    M block/sheepdog.c
    M include/block/block.h
    M trace-events

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into 
staging

# gpg: Signature made Fri 25 Sep 2015 16:47:31 BST using RSA key ID C0DE3057
# gpg: Good signature from "Jeffrey Cody <address@hidden>"
# gpg:                 aka "Jeffrey Cody <address@hidden>"
# gpg:                 aka "Jeffrey Cody <address@hidden>"

* remotes/cody/tags/block-pull-request:
  sheepdog: refine discard support
  sheepdog: use per AIOCB dirty indexes for non overlapping requests
  Backup: don't do copy-on-read in before_write_notifier
  block: Introduce a new API bdrv_co_no_copy_on_readv()
  sheepdog: add reopen support
  block/nfs: cache allocated filesize for read-only files
  block/nfs: fix calculation of allocated file size

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/690b286fefa8...54b376230c79