From 01ac2b72332f358396a9c356fe73eb30022ea759 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 28 Aug 2012 07:02:21 +0200 Subject: [PATCH] remove rbd-enable-cacheoption.patch --- debian/patches/rbd-enable-cacheoption.patch | 37 --------------------- debian/patches/series | 1 - 2 files changed, 38 deletions(-) delete mode 100644 debian/patches/rbd-enable-cacheoption.patch diff --git a/debian/patches/rbd-enable-cacheoption.patch b/debian/patches/rbd-enable-cacheoption.patch deleted file mode 100644 index 864b134..0000000 --- a/debian/patches/rbd-enable-cacheoption.patch +++ /dev/null @@ -1,37 +0,0 @@ -Signed-off-by: Josh Durgin ---- - block/rbd.c | 19 +++++++++++++++++++ - 1 files changed, 19 insertions(+), 0 deletions(-) - -diff --git a/block/rbd.c b/block/rbd.c -index 1280d66..eebc334 100644 ---- a/block/rbd.c -+++ b/block/rbd.c -@@ -476,6 +476,25 @@ static int qemu_rbd_open(BlockDriverState *bs, const char *filename, int flags) - s->snap = g_strdup(snap_buf); - } - -+ /* -+ * Fallback to more conservative semantics if setting cache -+ * options fails. Ignore errors from setting rbd_cache because the -+ * only possible error is that the option does not exist, and -+ * librbd defaults to no caching. If write through caching cannot -+ * be set up, fall back to no caching. -+ */ -+ if (flags & BDRV_O_NOCACHE) { -+ rados_conf_set(s->cluster, "rbd_cache", "false"); -+ } else { -+ rados_conf_set(s->cluster, "rbd_cache", "true"); -+ if (!(flags & BDRV_O_CACHE_WB)) { -+ r = rados_conf_set(s->cluster, "rbd_cache_max_dirty", "0"); -+ if (r < 0) { -+ rados_conf_set(s->cluster, "rbd_cache", "false"); -+ } -+ } -+ } -+ - if (strstr(conf, "conf=") == NULL) { - /* try default location, but ignore failure */ - rados_conf_read_file(s->cluster, NULL); --- -1.7.5.4 diff --git a/debian/patches/series b/debian/patches/series index d20745b..b1d04ba 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,5 +5,4 @@ keymap.diff set-max-nics.patch pve-auth.patch update-cpus-x86_64.conf-to-rhel6.2-version.patch -rbd-enable-cacheoption.patch vencrypt-auth-plain.patch -- 2.39.2