[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH for-3.1 v10 18/31] block/nfs: Implement bdrv_dirname
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH for-3.1 v10 18/31] block/nfs: Implement bdrv_dirname() |
Date: |
Thu, 9 Aug 2018 23:35:15 +0200 |
While the basic idea is obvious and could be handled by the default
bdrv_dirname() implementation, we cannot generate a directory name if
the gid or uid are set, so we have to explicitly return NULL in those
cases.
Signed-off-by: Max Reitz <address@hidden>
---
block/nfs.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/block/nfs.c b/block/nfs.c
index eab1a2c408..19ee07c321 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -855,6 +855,20 @@ static void nfs_refresh_filename(BlockDriverState *bs,
QDict *options)
bs->full_open_options = opts;
}
+static char *nfs_dirname(BlockDriverState *bs, Error **errp)
+{
+ NFSClient *client = bs->opaque;
+
+ if (client->uid || client->gid) {
+ bdrv_refresh_filename(bs);
+ error_setg(errp, "Cannot generate a base directory for NFS node '%s'",
+ bs->filename);
+ return NULL;
+ }
+
+ return g_strdup_printf("nfs://%s%s/", client->server->host, client->path);
+}
+
#ifdef LIBNFS_FEATURE_PAGECACHE
static void coroutine_fn nfs_co_invalidate_cache(BlockDriverState *bs,
Error **errp)
@@ -889,6 +903,7 @@ static BlockDriver bdrv_nfs = {
.bdrv_detach_aio_context = nfs_detach_aio_context,
.bdrv_attach_aio_context = nfs_attach_aio_context,
.bdrv_refresh_filename = nfs_refresh_filename,
+ .bdrv_dirname = nfs_dirname,
#ifdef LIBNFS_FEATURE_PAGECACHE
.bdrv_co_invalidate_cache = nfs_co_invalidate_cache,
--
2.17.1
- [Qemu-block] [PATCH for-3.1 v10 09/31] block: Make path_combine() return the path, (continued)
- [Qemu-block] [PATCH for-3.1 v10 09/31] block: Make path_combine() return the path, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 08/31] iotests: Add test for backing file overrides, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 10/31] block: bdrv_get_full_backing_filename_from_...'s ret. val., Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 11/31] block: bdrv_get_full_backing_filename's ret. val., Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 12/31] block: Add bdrv_make_absolute_filename(), Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 13/31] block: Fix bdrv_find_backing_image(), Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 14/31] block: Add bdrv_dirname(), Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 15/31] blkverify: Make bdrv_dirname() return NULL, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 16/31] quorum: Make bdrv_dirname() return NULL, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 17/31] block/nbd: Make bdrv_dirname() return NULL, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 18/31] block/nfs: Implement bdrv_dirname(),
Max Reitz <=
- [Qemu-block] [PATCH for-3.1 v10 19/31] block: Use bdrv_dirname() for relative filenames, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 20/31] iotests: Add quorum case to test 110, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 21/31] block: Add strong_runtime_opts to BlockDriver, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 23/31] block: Generically refresh runtime options, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 22/31] block: Add BlockDriver.bdrv_gather_child_options, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 25/31] block: Do not copy exact_filename from format file, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 26/31] block/nvme: Fix bdrv_refresh_filename(), Max Reitz, 2018/08/09