From 1007b2555c71f8cb93cbda1604ce221a4101027d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 4 Jan 2016 15:33:45 +0000
Subject: [PATCH] daemon: Fix ext2 labels error message (RHBZ#1294956).

---
 daemon/ext2.c | 6 +++---
 daemon/mkfs.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/daemon/ext2.c b/daemon/ext2.c
index 439b05675..898d066eb 100644
--- a/daemon/ext2.c
+++ b/daemon/ext2.c
@@ -131,7 +131,7 @@ do_set_e2label (const char *device, const char *label)
   CLEANUP_FREE char *err = NULL;
 
   if (strlen (label) > EXT2_LABEL_MAX) {
-    reply_with_error ("%s: ext2 labels are limited to %d bytes",
+    reply_with_error ("%s: ext2/3/4 labels are limited to %d bytes",
                       label, EXT2_LABEL_MAX);
     return -1;
   }
@@ -448,7 +448,7 @@ do_mke2journal_L (int blocksize, const char *label, const char *device)
   int r;
 
   if (strlen (label) > EXT2_LABEL_MAX) {
-    reply_with_error ("%s: ext2 labels are limited to %d bytes",
+    reply_with_error ("%s: ext2/3/4 labels are limited to %d bytes",
                       label, EXT2_LABEL_MAX);
     return -1;
   }
@@ -538,7 +538,7 @@ do_mke2fs_JL (const char *fstype, int blocksize, const char *device,
   }
 
   if (strlen (label) > EXT2_LABEL_MAX) {
-    reply_with_error ("%s: ext2 labels are limited to %d bytes",
+    reply_with_error ("%s: ext2/3/4 labels are limited to %d bytes",
                       label, EXT2_LABEL_MAX);
     return -1;
   }
diff --git a/daemon/mkfs.c b/daemon/mkfs.c
index 79d99eadc..cef3574a8 100644
--- a/daemon/mkfs.c
+++ b/daemon/mkfs.c
@@ -197,7 +197,7 @@ do_mkfs (const char *fstype, const char *device, int blocksize,
   if (optargs_bitmask & GUESTFS_MKFS_LABEL_BITMASK) {
     if (extfs) {
       if (strlen (label) > EXT2_LABEL_MAX) {
-        reply_with_error ("%s: ext2 labels are limited to %d bytes",
+        reply_with_error ("%s: ext2/3/4 labels are limited to %d bytes",
                           label, EXT2_LABEL_MAX);
         return -1;
       }