[PATCH 2/3] XFS metadump utility

[PATCH 2/3] XFS metadump utility

[Barry Naujok]

[-- Attachment #1: Type: text/plain, Size: 13 bytes --]

xfs_mdrestore

[-- Attachment #2: xfs_mdrestore.patch --]
[-- Type: application/octet-stream, Size: 8738 bytes --]


===========================================================================
xfsprogs/Makefile
===========================================================================

--- a/xfsprogs/Makefile	2007-05-28 14:52:34.000000000 +1000
+++ b/xfsprogs/Makefile	2007-05-18 12:03:22.774326854 +1000
@@ -16,7 +16,7 @@ LDIRT = config.log .dep config.status co
 	Logs/* built .census install.* install-dev.* *.gz
 
 SUBDIRS = include libxfs libxlog libxcmd libhandle libdisk \
-	copy db fsck growfs io logprint mkfs quota repair rtcp \
+	copy db fsck growfs io logprint mkfs quota mdrestore repair rtcp \
 	m4 man doc po debian build
 
 default: $(CONFIGURE)

===========================================================================
xfsprogs/mdrestore/Makefile
===========================================================================

--- a/xfsprogs/mdrestore/Makefile	2006-06-17 00:58:24.000000000 +1000
+++ b/xfsprogs/mdrestore/Makefile	2007-05-18 12:56:16.885040621 +1000
@@ -0,0 +1,22 @@
+#
+# Copyright (c) 2007 Silicon Graphics, Inc.  All Rights Reserved.
+#
+
+TOPDIR = ..
+include $(TOPDIR)/include/builddefs
+
+LTCOMMAND = xfs_mdrestore
+CFILES = xfs_mdrestore.c
+
+LLDLIBS = $(LIBXFS) $(LIBRT)
+LTDEPENDENCIES = $(LIBXFS)
+LLDFLAGS = -static
+
+default: $(LTCOMMAND)
+
+include $(BUILDRULES)
+
+install:
+	$(INSTALL) -m 755 -d $(PKG_BIN_DIR)
+	$(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)
+install-dev:

===========================================================================
xfsprogs/mdrestore/xfs_mdrestore.c
===========================================================================

--- a/xfsprogs/mdrestore/xfs_mdrestore.c	2006-06-17 00:58:24.000000000 +1000
+++ b/xfsprogs/mdrestore/xfs_mdrestore.c	2007-05-25 16:35:39.862905703 +1000
@@ -0,0 +1,263 @@
+/*
+ * Copyright (c) 2007 Silicon Graphics, Inc.
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <libxfs.h>
+#include "xfs_metadump.h"
+
+char 		*progname;
+int		show_progress = 0;
+int		progress_since_warning = 0;
+
+static void
+fatal(const char *msg, ...)
+{
+	va_list		args;
+
+	va_start(args, msg);
+	fprintf(stderr, "%s: ", progname);
+	vfprintf(stderr, msg, args);
+	exit(1);
+}
+
+static void
+print_progress(const char *fmt, ...)
+{
+	char		buf[60];
+	va_list		ap;
+
+	va_start(ap, fmt);
+	vsnprintf(buf, sizeof(buf), fmt, ap);
+	va_end(ap);
+	buf[sizeof(buf)-1] = '\0';
+
+	printf("\r%-59s", buf);
+	fflush(stdout);
+	progress_since_warning = 1;
+}
+
+static void
+perform_restore(
+	FILE			*src_f,
+	int			dst_fd,
+	int			is_target_file)
+{
+	xfs_metablock_t 	*metablock;	/* header + index + blocks */
+	__be64			*block_index;
+	char			*block_buffer;
+	int			block_size;
+	int			max_indicies;
+	int			cur_index;
+	xfs_metablock_t		tmb;
+	xfs_sb_t		sb;
+	__int64_t		bytes_read;
+
+	/*
+	 * read in first blocks (superblock 0), set "inprogress" flag for it,
+	 * read in the rest of the file, and if complete, clear SB 0's
+	 * "inprogress flag"
+	 */
+
+	if (fread(&tmb, sizeof(tmb), 1, src_f) != 1)
+		fatal("error reading from file: %s\n", strerror(errno));
+
+	if (be32_to_cpu(tmb.mb_magic) != XFS_MD_MAGIC)
+		fatal("specified file is not a metadata dump\n");
+
+	block_size = 1 << tmb.mb_blocklog;
+	max_indicies = (block_size - sizeof(xfs_metablock_t)) / sizeof(__be64);
+
+	metablock = (xfs_metablock_t *)calloc(max_indicies + 1, block_size);
+	if (metablock == NULL)
+		fatal("memory allocation failure\n");
+
+	metablock->mb_count = be16_to_cpu(tmb.mb_count);
+	metablock->mb_blocklog = tmb.mb_blocklog;
+
+	if (metablock->mb_count == 0 || metablock->mb_count > max_indicies)
+		fatal("bad block count: %u\n", metablock->mb_count);
+
+	block_index = (__be64 *)((char *)metablock + sizeof(xfs_metablock_t));
+	block_buffer = (char *)metablock + block_size;
+
+	if (fread(block_index, block_size - sizeof(tmb), 1, src_f) != 1)
+		fatal("error reading from file: %s\n", strerror(errno));
+
+	if (block_index[0] != 0)
+		fatal("first block is not the primary superblock\n");
+
+
+	if (fread(block_buffer, metablock->mb_count << metablock->mb_blocklog,
+			1, src_f) != 1)
+		fatal("error reading from file: %s\n", strerror(errno));
+
+	libxfs_xlate_sb(block_buffer, &sb, 1, XFS_SB_ALL_BITS);
+
+	if (sb.sb_magicnum != XFS_SB_MAGIC)
+		fatal("bad magic number for primary superblock\n");
+
+	((xfs_sb_t*)block_buffer)->sb_inprogress = 1;
+
+	if (is_target_file)  {
+		/* ensure regular files are correctly sized */
+
+		if (ftruncate64(dst_fd, sb.sb_dblocks * sb.sb_blocksize))
+			fatal("cannot set filesystem image size: %s\n",
+				strerror(errno));
+	} else  {
+		/* ensure device is sufficiently large enough */
+
+		char		*lb[XFS_MAX_SECTORSIZE] = { 0 };
+		off64_t		off;
+
+		off = sb.sb_dblocks * sb.sb_blocksize - sizeof(lb);
+		if (pwrite64(dst_fd, lb, sizeof(lb), off) < 0)
+			fatal("failed to write last block, is target too "
+				"small? (error: %s)\n", strerror(errno));
+	}
+
+	bytes_read = 0;
+
+	for (;;) {
+		if (show_progress && (bytes_read & ((1 << 20) - 1)) == 0)
+			print_progress("%lld MB read\n", bytes_read >> 20);
+
+		for (cur_index = 0; cur_index < metablock->mb_count; cur_index++) {
+			if (pwrite64(dst_fd, &block_buffer[cur_index <<
+						metablock->mb_blocklog],
+					block_size,
+					be64_to_cpu(block_index[cur_index]) <<
+						BBSHIFT) < 0)
+				fatal("error writing block %llu: %s\n",
+					be64_to_cpu(block_index[cur_index]) << BBSHIFT,
+					strerror(errno));
+		}
+		if (metablock->mb_count < max_indicies)
+			break;
+
+		if (fread(metablock, block_size, 1, src_f) != 1)
+			fatal("error reading from file: %s\n", strerror(errno));
+
+		if (metablock->mb_count == 0)
+			break;
+
+		metablock->mb_count = be16_to_cpu(metablock->mb_count);
+		if (metablock->mb_count > max_indicies)
+			fatal("bad block count: %u\n", metablock->mb_count);
+
+		if (fread(block_buffer, metablock->mb_count <<
+				 metablock->mb_blocklog, 1, src_f) != 1)
+			fatal("error reading from file: %s\n", strerror(errno));
+
+		bytes_read += block_size;
+	}
+
+	if (progress_since_warning)
+		putchar('\n');
+
+	memset(block_buffer, 0, sb.sb_sectsize);
+	sb.sb_inprogress = 0;
+	libxfs_xlate_sb(block_buffer, &sb, 0, XFS_SB_ALL_BITS);
+	if (pwrite(dst_fd, block_buffer, sb.sb_sectsize, 0) < 0)
+		fatal("error writing primary superblock: %s\n", strerror(errno));
+
+	free(metablock);
+}
+
+static void
+usage(void)
+{
+	fprintf(stderr, "Usage: %s [-bg] source target\n", progname);
+	exit(1);
+}
+
+extern int	platform_check_ismounted(char *, char *, struct stat64 *, int);
+
+int
+main(
+	int 		argc,
+	char 		**argv)
+{
+	FILE		*src_f;
+	int		dst_fd;
+	int		c;
+	int		open_flags;
+	struct stat64	statbuf;
+	int		is_target_file;
+
+	progname = basename(argv[0]);
+
+	while ((c = getopt(argc, argv, "gV")) != EOF) {
+		switch (c) {
+			case 'g':
+				show_progress = 1;
+				break;
+			case 'V':
+				printf("%s version %s\n", progname, VERSION);
+				exit(0);
+			default:
+				usage();
+		}
+	}
+
+	if (argc - optind != 2)
+		usage();
+
+	/* open source */
+	if (strcmp(argv[optind], "-") == 0) {
+		src_f = stdin;
+		if (isatty(fileno(stdin)))
+			fatal("cannot read from a terminal\n");
+	} else {
+		src_f = fopen(argv[optind], "rb");
+		if (src_f == NULL)
+			fatal("cannot open source dump file\n");
+	}
+	optind++;
+
+	/* check and open target */
+	open_flags = O_RDWR;
+	is_target_file = 0;
+	if (stat64(argv[optind], &statbuf) < 0)  {
+		/* ok, assume it's a file and create it */
+		open_flags |= O_CREAT;
+		is_target_file = 1;
+	} else if (S_ISREG(statbuf.st_mode))  {
+		open_flags |= O_TRUNC;
+		is_target_file = 1;
+	} else  {
+		/*
+		 * check to make sure a filesystem isn't mounted on the device
+		 */
+		if (platform_check_ismounted(argv[optind], NULL, &statbuf, 0))
+			fatal("a filesystem is mounted on target device \"%s\","
+				" cannot restore to a mounted filesystem.\n",
+				argv[optind]);
+	}
+
+	dst_fd = open(argv[optind], open_flags, 0644);
+	if (dst_fd < 0)
+		fatal("couldn't open target \"%s\"\n", argv[optind]);
+
+	perform_restore(src_f, dst_fd, is_target_file);
+
+	close(dst_fd);
+	if (src_f != stdin)
+		fclose(src_f);
+
+	return 0;
+}

Re: [PATCH 2/3] XFS metadump utility

[Christoph Hellwig]

On Mon, May 28, 2007 at 03:22:55PM +1000, Barry Naujok wrote:
> xfs_mdrestore

Looks good from a quick glance.