diff --git a/SOURCES/ci-cc_mounts-fix-incorrect-format-specifiers-316.patch b/SOURCES/ci-cc_mounts-fix-incorrect-format-specifiers-316.patch
new file mode 100644
index 0000000..9498e0a
--- /dev/null
+++ b/SOURCES/ci-cc_mounts-fix-incorrect-format-specifiers-316.patch
@@ -0,0 +1,90 @@
+From c3a019b57cade8e6c3963f6bd2c7c15cd67e561c Mon Sep 17 00:00:00 2001
+From: Eduardo Otubo <otubo@redhat.com>
+Date: Wed, 2 Sep 2020 14:59:06 +0200
+Subject: [PATCH] cc_mounts: fix incorrect format specifiers (#316)
+
+RH-Author: Eduardo Otubo <otubo@redhat.com>
+Message-id: <20200825131749.4989-1-otubo@redhat.com>
+Patchwork-id: 98217
+O-Subject: [RHEL-8.3.0 cloud-init PATCH] cc_mounts: fix incorrect format specifiers (#316)
+Bugzilla: 1794664
+RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>
+RH-Acked-by: Cathy Avery <cavery@redhat.com>
+
+Conflicts: Not exactly a conflict, but removed optional notations
+"variable: type" and "-> type" from function header create_swapfile() as
+it is only available on Python >= 3.5 and this patch is for RHEL-7.9
+only (Python 2.*). The rest of the cherry-pick was clean.
+
+commit 9d7b35ce23aaf8741dd49b16e359c96591be3c76
+Author: Daniel Watkins <oddbloke@ubuntu.com>
+Date:   Wed Apr 15 16:53:08 2020 -0400
+
+    cc_mounts: fix incorrect format specifiers (#316)
+
+    LP: #1872836
+
+Signed-off-by: Eduardo Otubo <otubo@redhat.com>
+Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
+---
+ cloudinit/config/cc_mounts.py         |  6 +++---
+ cloudinit/config/tests/test_mounts.py | 22 ++++++++++++++++++++++
+ 2 files changed, 25 insertions(+), 3 deletions(-)
+ create mode 100644 cloudinit/config/tests/test_mounts.py
+
+diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py
+index e1c43e3..55b6770 100644
+--- a/cloudinit/config/cc_mounts.py
++++ b/cloudinit/config/cc_mounts.py
+@@ -226,17 +226,17 @@ def suggested_swapsize(memsize=None, maxsize=None, fsys=None):
+ def create_swapfile(fname, size):
+     """Size is in MiB."""
+ 
+-    errmsg = "Failed to create swapfile '%s' of size %dMB via %s: %s"
++    errmsg = "Failed to create swapfile '%s' of size %sMB via %s: %s"
+ 
+     def create_swap(fname, size, method):
+         LOG.debug("Creating swapfile in '%s' on fstype '%s' using '%s'",
+                   fname, fstype, method)
+ 
+         if method == "fallocate":
+-            cmd = ['fallocate', '-l', '%dM' % size, fname]
++            cmd = ['fallocate', '-l', '%sM' % size, fname]
+         elif method == "dd":
+             cmd = ['dd', 'if=/dev/zero', 'of=%s' % fname, 'bs=1M',
+-                   'count=%d' % size]
++                   'count=%s' % size]
+ 
+         try:
+             util.subp(cmd, capture=True)
+diff --git a/cloudinit/config/tests/test_mounts.py b/cloudinit/config/tests/test_mounts.py
+new file mode 100644
+index 0000000..c7dad61
+--- /dev/null
++++ b/cloudinit/config/tests/test_mounts.py
+@@ -0,0 +1,22 @@
++# This file is part of cloud-init. See LICENSE file for license information.
++from unittest import mock
++
++from cloudinit.config.cc_mounts import create_swapfile
++
++
++M_PATH = 'cloudinit.config.cc_mounts.'
++
++
++class TestCreateSwapfile:
++
++    @mock.patch(M_PATH + 'util.subp')
++    def test_happy_path(self, m_subp, tmpdir):
++        swap_file = tmpdir.join("swap-file")
++        fname = str(swap_file)
++
++        # Some of the calls to util.subp should create the swap file; this
++        # roughly approximates that
++        m_subp.side_effect = lambda *args, **kwargs: swap_file.write('')
++
++        create_swapfile(fname, '')
++        assert mock.call(['mkswap', fname]) in m_subp.call_args_list
+-- 
+1.8.3.1
+
diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec
index 454891f..4648182 100644
--- a/SPECS/cloud-init.spec
+++ b/SPECS/cloud-init.spec
@@ -6,7 +6,7 @@
 
 Name:           cloud-init
 Version:        19.4
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Cloud instance init scripts
 
 Group:          System Environment/Base
@@ -52,6 +52,8 @@ Patch20: ci-swap-file-size-being-used-before-checked-if-str-315.patch
 Patch21: ci-Detect-kernel-version-before-swap-file-creation-428.patch
 # For bz#1839662 - [ESXi][RHEL8.3][cloud-init]ERROR log in cloud-init.log after clone VM on ESXi platform
 Patch22: ci-Changing-notation-of-subp-call.patch
+# For bz#1794664 - [RHEL8] swapon fails with "swapfile has holes" when created on a xfs filesystem by cloud-init
+Patch23: ci-cc_mounts-fix-incorrect-format-specifiers-316.patch
 
 BuildArch:      noarch
 
@@ -235,6 +237,11 @@ fi
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
 %changelog
+* Wed Sep 02 2020 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-11.el8
+- ci-cc_mounts-fix-incorrect-format-specifiers-316.patch [bz#1794664]
+- Resolves: bz#1794664
+  ([RHEL8] swapon fails with "swapfile has holes" when created on a xfs filesystem by cloud-init)
+
 * Mon Aug 31 2020 Miroslav Rezanina <mrezanin@redhat.com> - 19.4-10.el8
 - ci-Changing-notation-of-subp-call.patch [bz#1839662]
 - Resolves: bz#1839662