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 3/7] gluster: Query current size in do_truncate()
Date: Tue, 13 Feb 2018 14:03:52 +0100 [thread overview]
Message-ID: <20180213130356.8885-4-mreitz@redhat.com> (raw)
In-Reply-To: <20180213130356.8885-1-mreitz@redhat.com>
Instead of expecting the current size to be 0, query it and allocate
only the area [current_size, offset) if preallocation is requested.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
block/gluster.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/block/gluster.c b/block/gluster.c
index 8178541416..806b894bc8 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -968,10 +968,27 @@ static coroutine_fn int qemu_gluster_co_pwrite_zeroes(BlockDriverState *bs,
static int qemu_gluster_do_truncate(struct glfs_fd *fd, int64_t offset,
PreallocMode prealloc, Error **errp)
{
+ int64_t current_length;
+
+ current_length = glfs_lseek(fd, 0, SEEK_END);
+ if (current_length < 0) {
+ error_setg_errno(errp, errno, "Failed to determine current size");
+ return -errno;
+ }
+
+ if (current_length > offset && prealloc != PREALLOC_MODE_OFF) {
+ error_setg(errp, "Cannot use preallocation for shrinking files");
+ return -ENOTSUP;
+ }
+
+ if (current_length == offset) {
+ return 0;
+ }
+
switch (prealloc) {
#ifdef CONFIG_GLUSTERFS_FALLOCATE
case PREALLOC_MODE_FALLOC:
- if (glfs_fallocate(fd, 0, 0, offset)) {
+ if (glfs_fallocate(fd, 0, current_length, offset - current_length)) {
error_setg_errno(errp, errno, "Could not preallocate data");
return -errno;
}
@@ -983,7 +1000,7 @@ static int qemu_gluster_do_truncate(struct glfs_fd *fd, int64_t offset,
error_setg_errno(errp, errno, "Could not resize file");
return -errno;
}
- if (glfs_zerofill(fd, 0, offset)) {
+ if (glfs_zerofill(fd, current_length, offset - current_length)) {
error_setg_errno(errp, errno, "Could not zerofill the new area");
return -errno;
}
--
2.14.3
next prev 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 ` Max Reitz [this message]
2018-02-13 14:57 ` [Qemu-devel] [PATCH 3/7] gluster: Query current size in do_truncate() 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 ` [Qemu-devel] [PATCH 7/7] sheepdog: Allow fully preallocated truncation Max Reitz
2018-02-13 15:05 ` 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-4-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.