From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PATCH 05/18] fuse: Allow growable exports
Date: Thu, 19 Dec 2019 15:38:05 +0100 [thread overview]
Message-ID: <20191219143818.1646168-6-mreitz@redhat.com> (raw)
In-Reply-To: <20191219143818.1646168-1-mreitz@redhat.com>
These will behave more like normal files in that writes beyond the EOF
will automatically grow the export size.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
block/fuse.c | 16 +++++++++++++++-
qapi/block.json | 6 +++++-
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/block/fuse.c b/block/fuse.c
index 4e662e6dfb..d7c7824815 100644
--- a/block/fuse.c
+++ b/block/fuse.c
@@ -42,6 +42,7 @@ typedef struct BdrvFuseSession {
uint64_t perm, shared_perm;
bool mounted, fd_handler_set_up;
bool writable;
+ bool growable;
} BdrvFuseSession;
static GHashTable *sessions;
@@ -59,6 +60,7 @@ static bool is_regular_file(const char *path, Error **errp);
void qmp_fuse_export_add(const char *node_name, const char *mountpoint,
bool has_writable, bool writable,
+ bool has_growable, bool growable,
Error **errp)
{
BlockDriverState *bs;
@@ -67,6 +69,9 @@ void qmp_fuse_export_add(const char *node_name, const char *mountpoint,
if (!has_writable) {
writable = false;
}
+ if (!has_growable) {
+ growable = false;
+ }
init_fuse();
@@ -98,6 +103,7 @@ void qmp_fuse_export_add(const char *node_name, const char *mountpoint,
},
.writable = writable,
+ .growable = growable,
};
session->perm = BLK_PERM_CONSISTENT_READ;
@@ -463,7 +469,15 @@ static void fuse_write(fuse_req_t req, fuse_ino_t inode, const char *buf,
size = MIN(size, BDRV_REQUEST_MAX_BYTES);
if (offset + size > length) {
- size = length - offset;
+ if (session->growable) {
+ ret = fuse_do_truncate(session, offset + size, PREALLOC_MODE_OFF);
+ if (ret < 0) {
+ fuse_reply_err(req, -ret);
+ return;
+ }
+ } else {
+ size = length - offset;
+ }
}
ret = blk_pwrite(session->blk, offset, buf, size, 0);
diff --git a/qapi/block.json b/qapi/block.json
index 26768dc8ef..039cbc6773 100644
--- a/qapi/block.json
+++ b/qapi/block.json
@@ -330,13 +330,17 @@
# @writable: Whether clients should be able to write to the block
# device via the FUSE export. (default: false)
#
+# @growable: Whether writes beyond the EOF should grow the block node
+# fit. (default: false)
+#
# Since: 5.0
##
{ 'command': 'fuse-export-add',
'data': {
'node-name': 'str',
'mountpoint': 'str',
- '*writable': 'bool'
+ '*writable': 'bool',
+ '*growable': 'bool'
},
'if': 'defined(CONFIG_FUSE)' }
--
2.23.0
next prev parent reply other threads:[~2019-12-19 14:43 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-19 14:38 [PATCH 00/18] block: Allow exporting BDSs via FUSE Max Reitz
2019-12-19 14:38 ` [PATCH 01/18] configure: Detect libfuse Max Reitz
2019-12-19 14:38 ` [PATCH 02/18] fuse: Allow exporting BDSs via FUSE Max Reitz
2019-12-20 10:26 ` Kevin Wolf
2019-12-20 10:48 ` Max Reitz
2019-12-20 11:24 ` Kevin Wolf
2019-12-20 12:09 ` Max Reitz
2019-12-20 12:48 ` Markus Armbruster
2019-12-20 12:58 ` Kevin Wolf
2019-12-20 13:25 ` Markus Armbruster
2019-12-20 21:18 ` Eric Blake
2019-12-20 12:49 ` Markus Armbruster
2019-12-20 13:02 ` Kevin Wolf
2019-12-20 21:15 ` Eric Blake
2020-01-06 12:00 ` Max Reitz
2019-12-19 14:38 ` [PATCH 03/18] fuse: Implement standard FUSE operations Max Reitz
2019-12-19 14:38 ` [PATCH 04/18] fuse: Add fuse-export-remove Max Reitz
2019-12-19 14:38 ` Max Reitz [this message]
2019-12-19 14:38 ` [PATCH 06/18] fuse: (Partially) implement fallocate() Max Reitz
2019-12-19 14:38 ` [PATCH 07/18] fuse: Implement hole detection through lseek Max Reitz
2019-12-19 14:38 ` [PATCH 08/18] iotests: Do not needlessly filter _make_test_img Max Reitz
2019-12-19 14:38 ` [PATCH 09/18] iotests: Do not pipe _make_test_img Max Reitz
2019-12-19 14:38 ` [PATCH 10/18] iotests: Use convert -n in some cases Max Reitz
2019-12-19 14:38 ` [PATCH 11/18] iotests: Avoid renaming images Max Reitz
2019-12-19 14:38 ` [PATCH 12/18] iotests: Derive image names from $TEST_IMG Max Reitz
2019-12-19 14:38 ` [PATCH 13/18] iotests/091: Use _cleanup_qemu instad of "wait" Max Reitz
2019-12-19 14:38 ` [PATCH 14/18] iotests: Restrict some Python tests to file Max Reitz
2019-12-19 14:38 ` [PATCH 15/18] iotests: Let _make_test_img guess $TEST_IMG_FILE Max Reitz
2019-12-19 14:38 ` [PATCH 16/18] iotests: Allow testing FUSE exports Max Reitz
2019-12-19 14:38 ` [PATCH 17/18] iotests: Enable fuse for many tests Max Reitz
2019-12-19 14:38 ` [PATCH 18/18] iotests/281: Add test for FUSE exports Max Reitz
2019-12-19 19:05 ` [PATCH 00/18] block: Allow exporting BDSs via FUSE Max Reitz
2019-12-20 10:08 ` Stefan Hajnoczi
2019-12-20 10:30 ` Max Reitz
2019-12-20 12:50 ` Kevin Wolf
2019-12-20 21:20 ` Eric Blake
2020-01-02 11:22 ` Stefan Hajnoczi
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=20191219143818.1646168-6-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=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).