File 0006-make-bcache-remove-reduncant-code.patch of Package bcache-tools.14286

Overview Repositories Revisions Requests Users Attributes Meta

File 0006-make-bcache-remove-reduncant-code.patch of Package bcache-tools.14286

From 882bdffa79370b085eab64a6eefe25f65103e380 Mon Sep 17 00:00:00 2001
From: Coly Li <colyli@suse.de>
Date: Thu, 12 Dec 2019 20:25:20 +0800
Subject: [PATCH 11/16] make-bcache: remove reduncant code
Git-commit: 882bdffa79370b085eab64a6eefe25f65103e380
Patch-mainline: bcache-tools-1.1
References: bsc#1139948

Now we have main program 'bcache', the redundant code in 'make-bcache'
can be replaced by a simple calling to make_bcache().

The reason we still have 'make-bcache' in bcache-tools is to provide
legacy compatibility for other utilities who don't start to use main
program 'bcache' yet.

Signed-off-by: Coly Li <colyli@suse.de>
---
 Makefile      |  10 +-
 bcache-main.c |   2 +-
 make-bcache.c | 454 +-------------------------------------------------
 3 files changed, 10 insertions(+), 456 deletions(-)

Index: bcache-tools/Makefile
===================================================================
--- bcache-tools.orig/Makefile
+++ bcache-tools/Makefile
@@ -21,14 +21,18 @@ clean:
 	$(RM) -f bcache make-bcache probe-bcache bcache-super-show bcache-register bcache-test -- *.o
 
 bcache-test: LDLIBS += `pkg-config --libs openssl` -lm
-make-bcache: LDLIBS += `pkg-config --libs uuid blkid`
-make-bcache: CFLAGS += `pkg-config --cflags uuid blkid`
-make-bcache: bcache.o
+
+make-bcache: LDLIBS += `pkg-config --libs uuid blkid smartcols`
+make-bcache: CFLAGS += `pkg-config --cflags uuid blkid smartcols`
+make-bcache: make.o bcache.o lib.o 
+
 probe-bcache: LDLIBS += `pkg-config --libs uuid blkid`
 probe-bcache: CFLAGS += `pkg-config --cflags uuid blkid`
+
 bcache-super-show: LDLIBS += `pkg-config --libs uuid`
 bcache-super-show: CFLAGS += -std=gnu99
 bcache-super-show: bcache.o
+
 bcache-register: bcache-register.o
 
 bcache: CFLAGS += `pkg-config --cflags blkid uuid smartcols`
Index: bcache-tools/bcache-main.c
===================================================================
--- bcache-tools.orig/bcache-main.c
+++ bcache-tools/bcache-main.c
@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include <getopt.h>
 #include <regex.h>
-#include <libsmartcols.h>
+#include <libsmartcols/libsmartcols.h>
 #include "bcache.h"
 #include "lib.h"
 #include "make.h"
Index: bcache-tools/make-bcache.c
===================================================================
--- bcache-tools.orig/make-bcache.c
+++ bcache-tools/make-bcache.c
@@ -3,459 +3,9 @@
  *
  * GPLv2
  */
-
-#define _FILE_OFFSET_BITS	64
-#define __USE_FILE_OFFSET64
-#define _XOPEN_SOURCE 600
-
-#include <blkid.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <getopt.h>
-#include <limits.h>
-#include <linux/fs.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <uuid/uuid.h>
-
-#include "bcache.h"
-
-#define max(x, y) ({				\
-	typeof(x) _max1 = (x);			\
-	typeof(y) _max2 = (y);			\
-	(void) (&_max1 == &_max2);		\
-	_max1 > _max2 ? _max1 : _max2; })
-
-uint64_t getblocks(int fd)
-{
-	uint64_t ret;
-	struct stat statbuf;
-	if (fstat(fd, &statbuf)) {
-		perror("stat error\n");
-		exit(EXIT_FAILURE);
-	}
-	ret = statbuf.st_size / 512;
-	if (S_ISBLK(statbuf.st_mode))
-		if (ioctl(fd, BLKGETSIZE, &ret)) {
-			perror("ioctl error");
-			exit(EXIT_FAILURE);
-		}
-	return ret;
-}
-
-uint64_t hatoi(const char *s)
-{
-	char *e;
-	long long i = strtoll(s, &e, 10);
-	switch (*e) {
-		case 't':
-		case 'T':
-			i *= 1024;
-		case 'g':
-		case 'G':
-			i *= 1024;
-		case 'm':
-		case 'M':
-			i *= 1024;
-		case 'k':
-		case 'K':
-			i *= 1024;
-	}
-	return i;
-}
-
-unsigned hatoi_validate(const char *s, const char *msg)
-{
-	uint64_t v = hatoi(s);
-
-	if (v & (v - 1)) {
-		fprintf(stderr, "%s must be a power of two\n", msg);
-		exit(EXIT_FAILURE);
-	}
-
-	v /= 512;
-
-	if (v > USHRT_MAX) {
-		fprintf(stderr, "%s too large\n", msg);
-		exit(EXIT_FAILURE);
-	}
-
-	if (!v) {
-		fprintf(stderr, "%s too small\n", msg);
-		exit(EXIT_FAILURE);
-	}
-
-	return v;
-}
-
-char *skip_spaces(const char *str)
-{
-	while (isspace(*str))
-		++str;
-	return (char *)str;
-}
-
-char *strim(char *s)
-{
-	size_t size;
-	char *end;
-
-	s = skip_spaces(s);
-	size = strlen(s);
-	if (!size)
-		return s;
-
-	end = s + size - 1;
-	while (end >= s && isspace(*end))
-		end--;
-	*(end + 1) = '\0';
-
-	return s;
-}
-
-ssize_t read_string_list(const char *buf, const char * const list[])
-{
-	size_t i;
-	char *s, *d = strdup(buf);
-	if (!d)
-		return -ENOMEM;
-
-	s = strim(d);
-
-	for (i = 0; list[i]; i++)
-		if (!strcmp(list[i], s))
-			break;
-
-	free(d);
-
-	if (!list[i])
-		return -EINVAL;
-
-	return i;
-}
-
-void usage()
-{
-	fprintf(stderr,
-		   "Usage: make-bcache [options] device\n"
-	       "	-C, --cache		Format a cache device\n"
-	       "	-B, --bdev		Format a backing device\n"
-	       "	-b, --bucket		bucket size\n"
-	       "	-w, --block		block size (hard sector size of SSD, often 2k)\n"
-	       "	-o, --data-offset	data offset in sectors\n"
-	       "	    --cset-uuid		UUID for the cache set\n"
-//	       "	-U			UUID\n"
-	       "	    --writeback		enable writeback\n"
-	       "	    --discard		enable discards\n"
-	       "	    --cache_replacement_policy=(lru|fifo)\n"
-	       "	-h, --help		display this help and exit\n");
-	exit(EXIT_FAILURE);
-}
-
-const char * const cache_replacement_policies[] = {
-	"lru",
-	"fifo",
-	"random",
-	NULL
-};
-
-static void write_sb(char *dev, unsigned block_size, unsigned bucket_size,
-		     bool writeback, bool discard, bool wipe_bcache,
-		     unsigned cache_replacement_policy,
-		     uint64_t data_offset,
-		     uuid_t set_uuid, bool bdev)
-{
-	int fd;
-	char uuid_str[40], set_uuid_str[40], zeroes[SB_START] = {0};
-	struct cache_sb sb;
-	blkid_probe pr;
-
-	if ((fd = open(dev, O_RDWR|O_EXCL)) == -1) {
-		fprintf(stderr, "Can't open dev %s: %s\n", dev, strerror(errno));
-		exit(EXIT_FAILURE);
-	}
-
-	if (pread(fd, &sb, sizeof(sb), SB_START) != sizeof(sb))
-		exit(EXIT_FAILURE);
-
-	if (!memcmp(sb.magic, bcache_magic, 16) && !wipe_bcache) {
-		fprintf(stderr, "Already a bcache device on %s, "
-			"overwrite with --wipe-bcache\n", dev);
-		exit(EXIT_FAILURE);
-	}
-
-	if (!(pr = blkid_new_probe()))
-		exit(EXIT_FAILURE);
-	if (blkid_probe_set_device(pr, fd, 0, 0))
-		exit(EXIT_FAILURE);
-	/* enable ptable probing; superblock probing is enabled by default */
-	if (blkid_probe_enable_partitions(pr, true))
-		exit(EXIT_FAILURE);
-	if (!blkid_do_probe(pr)) {
-		/* XXX wipefs doesn't know how to remove partition tables */
-		fprintf(stderr, "Device %s already has a non-bcache superblock, "
-				"remove it using wipefs and wipefs -a\n", dev);
-		exit(EXIT_FAILURE);
-	}
-
-	memset(&sb, 0, sizeof(struct cache_sb));
-
-	sb.offset	= SB_SECTOR;
-	sb.version	= bdev
-		? BCACHE_SB_VERSION_BDEV
-		: BCACHE_SB_VERSION_CDEV;
-
-	memcpy(sb.magic, bcache_magic, 16);
-	uuid_generate(sb.uuid);
-	memcpy(sb.set_uuid, set_uuid, sizeof(sb.set_uuid));
-
-	sb.bucket_size	= bucket_size;
-	sb.block_size	= block_size;
-
-	uuid_unparse(sb.uuid, uuid_str);
-	uuid_unparse(sb.set_uuid, set_uuid_str);
-
-	if (SB_IS_BDEV(&sb)) {
-		SET_BDEV_CACHE_MODE(
-			&sb, writeback ? CACHE_MODE_WRITEBACK : CACHE_MODE_WRITETHROUGH);
-
-		if (data_offset != BDEV_DATA_START_DEFAULT) {
-			sb.version = BCACHE_SB_VERSION_BDEV_WITH_OFFSET;
-			sb.data_offset = data_offset;
-		}
-
-		printf("UUID:			%s\n"
-		       "Set UUID:		%s\n"
-		       "version:		%u\n"
-		       "block_size:		%u\n"
-		       "data_offset:		%ju\n",
-		       uuid_str, set_uuid_str,
-		       (unsigned) sb.version,
-		       sb.block_size,
-		       data_offset);
-	} else {
-		sb.nbuckets		= getblocks(fd) / sb.bucket_size;
-		sb.nr_in_set		= 1;
-		sb.first_bucket		= (23 / sb.bucket_size) + 1;
-
-		if (sb.nbuckets < 1 << 7) {
-			fprintf(stderr, "Not enough buckets: %ju, need %u\n",
-			       sb.nbuckets, 1 << 7);
-			exit(EXIT_FAILURE);
-		}
-
-		SET_CACHE_DISCARD(&sb, discard);
-		SET_CACHE_REPLACEMENT(&sb, cache_replacement_policy);
-
-		printf("UUID:			%s\n"
-		       "Set UUID:		%s\n"
-		       "version:		%u\n"
-		       "nbuckets:		%ju\n"
-		       "block_size:		%u\n"
-		       "bucket_size:		%u\n"
-		       "nr_in_set:		%u\n"
-		       "nr_this_dev:		%u\n"
-		       "first_bucket:		%u\n",
-		       uuid_str, set_uuid_str,
-		       (unsigned) sb.version,
-		       sb.nbuckets,
-		       sb.block_size,
-		       sb.bucket_size,
-		       sb.nr_in_set,
-		       sb.nr_this_dev,
-		       sb.first_bucket);
-	}
-
-	sb.csum = csum_set(&sb);
-
-	/* Zero start of disk */
-	if (pwrite(fd, zeroes, SB_START, 0) != SB_START) {
-		perror("write error\n");
-		exit(EXIT_FAILURE);
-	}
-	/* Write superblock */
-	if (pwrite(fd, &sb, sizeof(sb), SB_START) != sizeof(sb)) {
-		perror("write error\n");
-		exit(EXIT_FAILURE);
-	}
-
-	fsync(fd);
-	close(fd);
-}
-
-static unsigned get_blocksize(const char *path)
-{
-	struct stat statbuf;
-
-	if (stat(path, &statbuf)) {
-		fprintf(stderr, "Error statting %s: %s\n",
-			path, strerror(errno));
-		exit(EXIT_FAILURE);
-	}
-
-	if (S_ISBLK(statbuf.st_mode)) {
-		/* check IO limits:
-		 * BLKALIGNOFF: alignment_offset
-		 * BLKPBSZGET: physical_block_size
-		 * BLKSSZGET: logical_block_size
-		 * BLKIOMIN: minimum_io_size
-		 * BLKIOOPT: optimal_io_size
-		 *
-		 * It may be tempting to use physical_block_size,
-		 * or even minimum_io_size.
-		 * But to be as transparent as possible,
-		 * we want to use logical_block_size.
-		 */
-		unsigned int logical_block_size;
-		int fd = open(path, O_RDONLY);
-
-		if (fd < 0) {
-			fprintf(stderr, "open(%s) failed: %m\n", path);
-			exit(EXIT_FAILURE);
-		}
-		if (ioctl(fd, BLKSSZGET, &logical_block_size)) {
-			fprintf(stderr, "ioctl(%s, BLKSSZGET) failed: %m\n", path);
-			exit(EXIT_FAILURE);
-		}
-		close(fd);
-		return logical_block_size / 512;
-
-	}
-	/* else: not a block device.
-	 * Why would we even want to write a bcache super block there? */
-
-	return statbuf.st_blksize / 512;
-}
+#include "make-bcache.h"
 
 int main(int argc, char **argv)
 {
-	int c, bdev = -1;
-	unsigned i, ncache_devices = 0, nbacking_devices = 0;
-	char *cache_devices[argc];
-	char *backing_devices[argc];
-
-	unsigned block_size = 0, bucket_size = 1024;
-	int writeback = 0, discard = 0, wipe_bcache = 0;
-	unsigned cache_replacement_policy = 0;
-	uint64_t data_offset = BDEV_DATA_START_DEFAULT;
-	uuid_t set_uuid;
-
-	uuid_generate(set_uuid);
-
-	struct option opts[] = {
-		{ "cache",		0, NULL,	'C' },
-		{ "bdev",		0, NULL,	'B' },
-		{ "bucket",		1, NULL,	'b' },
-		{ "block",		1, NULL,	'w' },
-		{ "writeback",		0, &writeback,	1 },
-		{ "wipe-bcache",	0, &wipe_bcache,	1 },
-		{ "discard",		0, &discard,	1 },
-		{ "cache_replacement_policy", 1, NULL, 'p' },
-		{ "cache-replacement-policy", 1, NULL, 'p' },
-		{ "data_offset",	1, NULL,	'o' },
-		{ "data-offset",	1, NULL,	'o' },
-		{ "cset-uuid",		1, NULL,	'u' },
-		{ "help",		0, NULL,	'h' },
-		{ NULL,			0, NULL,	0 },
-	};
-
-	while ((c = getopt_long(argc, argv,
-				"-hCBUo:w:b:",
-				opts, NULL)) != -1)
-		switch (c) {
-		case 'C':
-			bdev = 0;
-			break;
-		case 'B':
-			bdev = 1;
-			break;
-		case 'b':
-			bucket_size = hatoi_validate(optarg, "bucket size");
-			break;
-		case 'w':
-			block_size = hatoi_validate(optarg, "block size");
-			break;
-#if 0
-		case 'U':
-			if (uuid_parse(optarg, sb.uuid)) {
-				fprintf(stderr, "Bad uuid\n");
-				exit(EXIT_FAILURE);
-			}
-			break;
-#endif
-		case 'p':
-			cache_replacement_policy = read_string_list(optarg,
-						    cache_replacement_policies);
-			break;
-		case 'o':
-			data_offset = atoll(optarg);
-			if (data_offset < BDEV_DATA_START_DEFAULT) {
-				fprintf(stderr, "Bad data offset; minimum %d sectors\n",
-				       BDEV_DATA_START_DEFAULT);
-				exit(EXIT_FAILURE);
-			}
-			break;
-		case 'u':
-			if (uuid_parse(optarg, set_uuid)) {
-				fprintf(stderr, "Bad uuid\n");
-				exit(EXIT_FAILURE);
-			}
-			break;
-		case 'h':
-			usage();
-			break;
-		case 1:
-			if (bdev == -1) {
-				fprintf(stderr, "Please specify -C or -B\n");
-				exit(EXIT_FAILURE);
-			}
-
-			if (bdev)
-				backing_devices[nbacking_devices++] = optarg;
-			else
-				cache_devices[ncache_devices++] = optarg;
-			break;
-		}
-
-	if (!ncache_devices && !nbacking_devices) {
-		fprintf(stderr, "Please supply a device\n");
-		usage();
-	}
-
-	if (bucket_size < block_size) {
-		fprintf(stderr, "Bucket size cannot be smaller than block size\n");
-		exit(EXIT_FAILURE);
-	}
-
-	if (!block_size) {
-		for (i = 0; i < ncache_devices; i++)
-			block_size = max(block_size,
-					 get_blocksize(cache_devices[i]));
-
-		for (i = 0; i < nbacking_devices; i++)
-			block_size = max(block_size,
-					 get_blocksize(backing_devices[i]));
-	}
-
-	for (i = 0; i < ncache_devices; i++)
-		write_sb(cache_devices[i], block_size, bucket_size,
-			 writeback, discard, wipe_bcache,
-			 cache_replacement_policy,
-			 data_offset, set_uuid, false);
-
-	for (i = 0; i < nbacking_devices; i++)
-		write_sb(backing_devices[i], block_size, bucket_size,
-			 writeback, discard, wipe_bcache,
-			 cache_replacement_policy,
-			 data_offset, set_uuid, true);
-
-	return 0;
+	return make_bcache(argc, argv);
 }

Places

File 0006-make-bcache-remove-reduncant-code.patch of Package bcache-tools.14286

Places