qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 15/55] sheepdog: Allow fully preallocated truncation
Date: Tue, 13 Feb 2018 18:04:49 +0100	[thread overview]
Message-ID: <20180213170529.10858-16-kwolf@redhat.com> (raw)
In-Reply-To: <20180213170529.10858-1-kwolf@redhat.com>

From: Max Reitz <mreitz@redhat.com>

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/sheepdog.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/block/sheepdog.c b/block/sheepdog.c
index d300fb69c0..ac02b10fe0 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -2180,15 +2180,16 @@ static int sd_truncate(BlockDriverState *bs, int64_t offset,
     int ret, fd;
     unsigned int datalen;
     uint64_t max_vdi_size;
+    int64_t old_size = s->inode.vdi_size;
 
-    if (prealloc != PREALLOC_MODE_OFF) {
+    if (prealloc != PREALLOC_MODE_OFF && prealloc != PREALLOC_MODE_FULL) {
         error_setg(errp, "Unsupported preallocation mode '%s'",
                    PreallocMode_str(prealloc));
         return -ENOTSUP;
     }
 
     max_vdi_size = (UINT64_C(1) << s->inode.block_size_shift) * MAX_DATA_OBJS;
-    if (offset < s->inode.vdi_size) {
+    if (offset < old_size) {
         error_setg(errp, "shrinking is not supported");
         return -EINVAL;
     } else if (offset > max_vdi_size) {
@@ -2211,9 +2212,17 @@ static int sd_truncate(BlockDriverState *bs, int64_t offset,
 
     if (ret < 0) {
         error_setg_errno(errp, -ret, "failed to update an inode");
+        return ret;
     }
 
-    return ret;
+    if (prealloc == PREALLOC_MODE_FULL) {
+        ret = sd_prealloc(bs, old_size, offset, errp);
+        if (ret < 0) {
+            return ret;
+        }
+    }
+
+    return 0;
 }
 
 /*
-- 
2.13.6

  parent reply	other threads:[~2018-02-13 17:05 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-13 17:04 [Qemu-devel] [PULL 00/55] Block layer patches Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 01/55] iotests: Fix CID for VMDK afl image Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 02/55] qemu-img.texi: Clean up parameter list Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 03/55] qemu-img: Document --force-share / -U Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 04/55] docs: Document share-rw property more thoroughly Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 05/55] qcow2: Use g_try_realloc() in qcow2_expand_zero_clusters() Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 06/55] block: early check for blockers on drive-mirror Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 07/55] iotests: Use virtio-blk in 155 Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 08/55] qemu-io: fix EOF Ctrl-D handling in qemu-io readline code Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 09/55] gluster: Move glfs_close() to create's clean-up Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 10/55] gluster: Pull truncation from qemu_gluster_create Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 11/55] gluster: Query current size in do_truncate() Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 12/55] gluster: Add preallocated truncation Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 13/55] sheepdog: Make sd_prealloc() take a BDS Kevin Wolf
2018-05-08 15:33   ` Peter Maydell
2018-02-13 17:04 ` [Qemu-devel] [PULL 14/55] sheepdog: Pass old and new size to sd_prealloc() Kevin Wolf
2018-02-13 17:04 ` Kevin Wolf [this message]
2018-02-13 17:04 ` [Qemu-devel] [PULL 16/55] block: maintain persistent disabled bitmaps Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 17/55] qcow2: Fix documentation of get_cluster_table() Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 18/55] qcow2: Add table size field to Qcow2Cache Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 19/55] qcow2: Remove BDS parameter from qcow2_cache_get_table_addr() Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 20/55] qcow2: Remove BDS parameter from qcow2_cache_get_table_idx() Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 21/55] qcow2: Remove BDS parameter from qcow2_cache_table_release() Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 22/55] qcow2: Remove BDS parameter from qcow2_cache_entry_mark_dirty() Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 23/55] qcow2: Remove BDS parameter from qcow2_cache_put() Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 24/55] qcow2: Remove BDS parameter from qcow2_cache_destroy() Kevin Wolf
2018-02-13 17:04 ` [Qemu-devel] [PULL 25/55] qcow2: Remove BDS parameter from qcow2_cache_clean_unused() Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 26/55] qcow2: Remove BDS parameter from qcow2_cache_discard() Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 27/55] qcow2: Remove BDS parameter from qcow2_cache_is_table_offset() Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 28/55] qcow2: Add offset_to_l1_index() Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 29/55] qcow2: Add l2_slice_size field to BDRVQcow2State Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 30/55] qcow2: Add offset_to_l2_slice_index() Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 31/55] qcow2: Update l2_load() to support L2 slices Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 32/55] qcow2: Prepare l2_allocate() for adding L2 slice support Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 33/55] qcow2: Update l2_allocate() to support L2 slices Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 34/55] qcow2: Refactor get_cluster_table() Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 35/55] qcow2: Update get_cluster_table() to support L2 slices Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 36/55] qcow2: Update qcow2_get_cluster_offset() " Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 37/55] qcow2: Update qcow2_alloc_cluster_link_l2() " Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 38/55] qcow2: Update handle_copied() " Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 39/55] qcow2: Update handle_alloc() " Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 40/55] qcow2: Update discard_single_l2() " Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 41/55] qcow2: Update zero_single_l2() " Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 42/55] qcow2: Prepare qcow2_update_snapshot_refcount() for adding L2 slice support Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 43/55] qcow2: Update qcow2_update_snapshot_refcount() to support L2 slices Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 44/55] qcow2: Read refcount before L2 table in expand_zero_clusters_in_l1() Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 45/55] qcow2: Prepare expand_zero_clusters_in_l1() for adding L2 slice support Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 46/55] qcow2: Update expand_zero_clusters_in_l1() to support L2 slices Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 47/55] qcow2: Update qcow2_truncate() " Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 48/55] qcow2: Rename l2_table in qcow2_alloc_compressed_cluster_offset() Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 49/55] qcow2: Rename l2_table in count_contiguous_clusters() Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 50/55] qcow2: Rename l2_table in count_contiguous_clusters_unallocated() Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 51/55] qcow2: Rename l2_table in count_cow_clusters() Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 52/55] qcow2: Allow configuring the L2 slice size Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 53/55] iotests: Test valid values of l2-cache-entry-size Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 54/55] iotests: Test downgrading an image using a small L2 slice size Kevin Wolf
2018-02-13 17:05 ` [Qemu-devel] [PULL 55/55] iotests: Add l2-cache-entry-size to iotest 137 Kevin Wolf
2018-02-15 10:13 ` [Qemu-devel] [PULL 00/55] Block layer patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180213170529.10858-16-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).