79 lines
2.7 KiB
Diff
79 lines
2.7 KiB
Diff
|
From 46f7f481f4270304f358c4c6a0020ca0ca7b9e97 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Chris Mason <chris.mason@oracle.com>
|
||
|
|
Date: Wed, 8 Feb 2012 22:26:26 -0500
|
||
|
|
Subject: [PATCH 10/18] Fix btrfs-convert, btrfs-restore and btrfs-find-root
|
||
|
|
build
|
||
|
|
|
||
|
|
Signed-off-by: Chris Mason <chris.mason@oracle.com>
|
||
|
|
|
||
|
|
fixit
|
||
|
|
Signed-off-by: Chris Mason <chris.mason@oracle.com>
|
||
|
|
---
|
||
|
|
Makefile | 14 +++++++-------
|
||
|
|
convert.c | 2 +-
|
||
|
|
2 files changed, 8 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile b/Makefile
|
||
|
|
index 930500e..556bcce 100644
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -17,7 +17,8 @@ LIBS=-luuid
|
||
|
|
RESTORE_LIBS=-lz -llzo2
|
||
|
|
|
||
|
|
progs = btrfsctl mkfs.btrfs btrfs-debug-tree btrfs-show btrfs-vol btrfsck \
|
||
|
|
- btrfs btrfs-map-logical btrfs-image btrfs-zero-log \
|
||
|
|
+ btrfs btrfs-map-logical btrfs-image btrfs-zero-log btrfs-convert \
|
||
|
|
+ btrfs-find-root btrfs-restore btrfstune \
|
||
|
|
btrfs-dump-super
|
||
|
|
|
||
|
|
btrfs_man_page_source = btrfs.c btrfs_cmds.c scrub.c
|
||
|
|
@@ -47,11 +48,11 @@ btrfs: $(objects) btrfs.o btrfs_cmds.o scrub.o helpmsg.o
|
||
|
|
calc-size: $(objects) calc-size.o
|
||
|
|
gcc $(CFLAGS) -o calc-size calc-size.o $(objects) $(LDFLAGS) $(LIBS)
|
||
|
|
|
||
|
|
-find-root: $(objects) find-root.o
|
||
|
|
- gcc $(CFLAGS) -o find-root find-root.o $(objects) $(LDFLAGS) $(LIBS)
|
||
|
|
+btrfs-find-root: $(objects) find-root.o
|
||
|
|
+ gcc $(CFLAGS) -o btrfs-find-root find-root.o $(objects) $(LDFLAGS) $(LIBS)
|
||
|
|
|
||
|
|
-restore: $(objects) restore.o
|
||
|
|
- gcc $(CFLAGS) -o restore restore.o $(objects) $(LDFLAGS) $(LIBS) $(RESTORE_LIBS)
|
||
|
|
+btrfs-restore: $(objects) restore.o
|
||
|
|
+ gcc $(CFLAGS) -o btrfs-restore restore.o $(objects) $(LDFLAGS) $(LIBS) $(RESTORE_LIBS)
|
||
|
|
|
||
|
|
btrfsctl: $(objects) btrfsctl.o
|
||
|
|
$(CC) $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS)
|
||
|
|
@@ -98,7 +99,7 @@ dir-test: $(objects) dir-test.o
|
||
|
|
quick-test: $(objects) quick-test.o
|
||
|
|
$(CC) $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS)
|
||
|
|
|
||
|
|
-convert: $(objects) convert.o
|
||
|
|
+btrfs-convert: $(objects) convert.o
|
||
|
|
$(CC) $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs -lcom_err $(LDFLAGS) $(LIBS)
|
||
|
|
|
||
|
|
ioctl-test: $(objects) ioctl-test.o
|
||
|
|
@@ -140,7 +141,6 @@ clean :
|
||
|
|
install: $(progs) install-man
|
||
|
|
$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
|
||
|
|
$(INSTALL) $(progs) $(DESTDIR)$(bindir)
|
||
|
|
- if [ -e btrfs-convert ]; then $(INSTALL) btrfs-convert $(DESTDIR)$(bindir); fi
|
||
|
|
|
||
|
|
test: test-userspace test-root
|
||
|
|
|
||
|
|
diff --git a/convert.c b/convert.c
|
||
|
|
index a2f7925..5afcc45 100644
|
||
|
|
--- a/convert.c
|
||
|
|
+++ b/convert.c
|
||
|
|
@@ -1675,7 +1675,7 @@ static int init_btrfs(struct btrfs_root *root)
|
||
|
|
ret = btrfs_make_block_groups(trans, root);
|
||
|
|
if (ret)
|
||
|
|
goto err;
|
||
|
|
- ret = btrfs_fixup_block_accounting(trans, root);
|
||
|
|
+ ret = btrfs_fix_block_accounting(trans, root);
|
||
|
|
if (ret)
|
||
|
|
goto err;
|
||
|
|
ret = create_chunk_mapping(trans, root);
|
||
|
|
--
|
||
|
|
1.7.6.233.gd79bc
|
||
|
|
|