From patchwork Fri Sep 27 19:01:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Maiolino X-Patchwork-Id: 278668 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7F83B2C0334 for ; Sat, 28 Sep 2013 05:01:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754686Ab3I0TBm (ORCPT ); Fri, 27 Sep 2013 15:01:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53537 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754646Ab3I0TBl (ORCPT ); Fri, 27 Sep 2013 15:01:41 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8RJ1eYw024502 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 27 Sep 2013 15:01:40 -0400 Received: from orion.redhat.com (ovpn-113-161.phx2.redhat.com [10.3.113.161]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r8RJ1ceV000388 for ; Fri, 27 Sep 2013 15:01:39 -0400 From: Carlos Maiolino To: linux-ext4@vger.kernel.org Subject: [PATCH] e2image: Print a warning if running over a mounted filesystem Date: Fri, 27 Sep 2013 16:01:35 -0300 Message-Id: <1380308495-3956-1-git-send-email-cmaiolino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Several users use to run e2image over a mounted RW filesystem, providing inconsistent, useless e2images for debugging purposes. This patch adds a warning in such cases, notifying the user and also adds a force option making e2image able to run in such cases. Also print a warning when not using qcow or raw formats but allows image creation to proceed, since, such images might be used for metadata backup purposes. Signed-off-by: Carlos Maiolino --- misc/e2image.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/misc/e2image.c b/misc/e2image.c index 885a794..e467301 100644 --- a/misc/e2image.c +++ b/misc/e2image.c @@ -87,7 +87,7 @@ static int get_bits_from_size(size_t size) static void usage(void) { - fprintf(stderr, _("Usage: %s [-rsIQa] device image_file\n"), + fprintf(stderr, _("Usage: %s [-rsIQaf] device image_file\n"), program_name); exit (1); } @@ -1252,9 +1252,11 @@ int main (int argc, char ** argv) int open_flag = EXT2_FLAG_64BITS; int img_type = 0; int flags = 0; + int mount_flags = 0; int qcow2_fd = 0; int fd = 0; int ret = 0; + int ignore_rw_mount = 0; struct stat st; #ifdef ENABLE_NLS @@ -1269,7 +1271,7 @@ int main (int argc, char ** argv) if (argc && *argv) program_name = *argv; add_error_table(&et_ext2_error_table); - while ((c = getopt(argc, argv, "rsIQa")) != EOF) + while ((c = getopt(argc, argv, "rsIQaf")) != EOF) switch (c) { case 'I': flags |= E2IMAGE_INSTALL_FLAG; @@ -1290,6 +1292,9 @@ int main (int argc, char ** argv) case 'a': all_data = 1; break; + case 'f': + ignore_rw_mount = 1; + break; default: usage(); } @@ -1305,6 +1310,31 @@ int main (int argc, char ** argv) device_name = argv[optind]; image_fn = argv[optind+1]; + ext2fs_check_if_mounted(device_name, &mount_flags); + + if ((mount_flags & EXT2_MF_MOUNTED) && + !(mount_flags & EXT2_MF_READONLY)) { + fprintf(stderr, "\nWarning: Running e2image on a mounted " + "RW filesystem can result in an inconsistent " + "image which will not be useful for " + "debugging purposes.\n"); + /* + * A force is required here once qcow and raw image + * formats (img_type is set) are mostly used for + * debugging purposes, while, a "normal" image is + * usually collected for metadata backup. + * + * An inconsistent image is almost useless for + * debugging, so we ensure the filesystem is read-only + * before continue (unless the user force the image creation) + */ + if (img_type && !ignore_rw_mount) { + fprintf(stderr, "Use -f option if you really want to " + "do that.\n"); + exit(1); + } + } + if (flags & E2IMAGE_INSTALL_FLAG) { install_image(device_name, image_fn, img_type); exit (0);