Skip to contentSkip to conversation

btrfs-progs: move btrfslabel.[c|h] stuff to utils.[c|h]

PATCH New Jeff Liu 1 participant 1 message Jan 30, 2013

Subsystems (2)
Kbuild Btrfs file system
lore
Share & tools
lore

Jeff Liu

author
#0 lore raw

PATCH v2 2/2 btrfs-progs: move btrfslabel.[c|h] stuff to utils.[c|h]

Clean btrfslabel.[c|h] out of the source tree and move those related functions to utils.[c|h].

Signed-off-by Jie Liu <[email protected]>
CC David Sterba <[email protected]>
CC Gene Czarcinski <[email protected]>
---
 Makefile          |    4 +-
 btrfslabel.c      |  178 -----------------------------------------------------
 btrfslabel.h      |    5 --
 cmds-filesystem.c |    1 -
 utils.c           |  130 ++++++++++++++++++++++++++++++++++++++
 utils.h           |    2 +
 6 files changed, 134 insertions(+), 186 deletions(-)
 delete mode 100644 btrfslabel.c
 delete mode 100644 btrfslabel.h
Makefile +2 -2
index 4894903..e54b21e 100644
@@ -4,8 +4,8 @@ CFLAGS = -g -O1
 objects = ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \
 	  root-tree.o dir-item.o file-item.o inode-item.o \
 	  inode-map.o crc32c.o rbtree.o extent-cache.o extent_io.o \
-	  volumes.o utils.o btrfs-list.o btrfslabel.o repair.o \
-	  send-stream.o send-utils.o qgroup.o
+	  volumes.o utils.o btrfs-list.o repair.o send-stream.o \
+	  send-utils.o qgroup.o
 cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \
 	       cmds-inspect.o cmds-balance.o cmds-send.o cmds-receive.o \
 	       cmds-quota.o cmds-qgroup.o
btrfslabel.c deleted +0 -178

178 lines not on this page · raw message

btrfslabel.h deleted +0 -5
deleted file mode 100644
index abf43ad..0000000
@@ -1,5 +0,0 @@
-/* btrflabel.h */
-
-
-int get_label(char *btrfs_dev);
-int set_label(char *btrfs_dev, char *nLabel);
\ No newline at end of file
cmds-filesystem.c +0 -1
index 5770d8b..3752703 100644
@@ -32,7 +32,6 @@
 #include "version.h"
 
 #include "commands.h"
-#include "btrfslabel.h"
 
 static const char * const filesystem_cmd_group_usage[] = {
 	"btrfs filesystem [<group>] <command> [<args>]",
utils.c +130 -0

147 lines not on this page · raw message

utils.h +2 -0
index a0b782b..632b01c 100644
@@ -46,4 +46,6 @@ int get_mountpt(char *dev, char *mntpt, size_t size);
 
 int btrfs_scan_block_devices(int run_ioctl);
 int is_existing_blk_or_reg_file(const char* filename);
+int get_label(const char *btrfs_dev);
+int set_label(const char *btrfs_dev, const char *label);
 #endif
Signature · 5 lines
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo