qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
	sheepdog@lists.wpkg.org, Kevin Wolf <kwolf@redhat.com>,
	Jeff Cody <jcody@redhat.com>,
	Hitoshi Mitake <mitake.hitoshi@lab.ntt.co.jp>,
	Liu Yuan <namei.unix@gmail.com>
Subject: [Qemu-devel] [PATCH 7/7] sheepdog: Allow fully preallocated truncation
Date: Tue, 13 Feb 2018 14:03:56 +0100	[thread overview]
Message-ID: <20180213130356.8885-8-mreitz@redhat.com> (raw)
In-Reply-To: <20180213130356.8885-1-mreitz@redhat.com>

Signed-off-by: Max Reitz <mreitz@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.14.3

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

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-13 13:03 [Qemu-devel] [PATCH 0/7] block: Preallocated truncation for gluster and sheepdog Max Reitz
2018-02-13 13:03 ` [Qemu-devel] [PATCH 1/7] gluster: Move glfs_close() to create's clean-up Max Reitz
2018-02-13 14:54   ` Eric Blake
2018-02-13 13:03 ` [Qemu-devel] [PATCH 2/7] gluster: Pull truncation from qemu_gluster_create Max Reitz
2018-02-13 14:56   ` Eric Blake
2018-02-13 13:03 ` [Qemu-devel] [PATCH 3/7] gluster: Query current size in do_truncate() Max Reitz
2018-02-13 14:57   ` Eric Blake
2018-02-13 13:03 ` [Qemu-devel] [PATCH 4/7] gluster: Add preallocated truncation Max Reitz
2018-02-13 14:58   ` Eric Blake
2018-02-13 13:03 ` [Qemu-devel] [PATCH 5/7] sheepdog: Make sd_prealloc() take a BDS Max Reitz
2018-02-13 15:02   ` Eric Blake
2018-02-13 13:03 ` [Qemu-devel] [PATCH 6/7] sheepdog: Pass old and new size to sd_prealloc() Max Reitz
2018-02-13 15:04   ` Eric Blake
2018-02-13 13:03 ` Max Reitz [this message]
2018-02-13 15:05   ` [Qemu-devel] [PATCH 7/7] sheepdog: Allow fully preallocated truncation Eric Blake
2018-02-13 15:19 ` [Qemu-devel] [PATCH 0/7] block: Preallocated truncation for gluster and sheepdog Kevin Wolf

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=20180213130356.8885-8-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=jcody@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mitake.hitoshi@lab.ntt.co.jp \
    --cc=namei.unix@gmail.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=sheepdog@lists.wpkg.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).