btrfs-progs: more statics & removals

PATCH Superseded Eric Sandeen 3 participants 12 messages Aug 7, 2013 – Aug 9, 2013 Btrfs file system

lore

Share & tools

lore

Eric Sandeen

author

2013-08-07 01:01 UTC #0 lore raw

cover btrfs-progs: more statics & removals

2 patches, one for shared kernel files, one for pure userspace.

In kernelspace, lots of unused functions purged. Some functions which could be static are left alone if they aren't marked static in kernelspace.

userspace only has a couple removals, mostly just marking static & removing prototypes in headers as appropriate.

Thanks,
-Eric

Eric Sandeen

author

2013-08-07 01:03 UTC #1 lore raw

PATCH 1/2 btrfs-progs: mark static & remove unused from shared kernel code

In files copied from the kernel, mark many functions as static, and remove any resulting dead code.

Some functions are left unmarked if they aren't static in the kernel tree.

Signed-off-by Eric Sandeen <[email protected]>

---

 ctree.c            |    2 
 ctree.h            |   43 -------------------
 dir-item.c         |   97 ++------------------------------------------
 disk-io.c          |   14 +++---
 disk-io.h          |    4 -
 extent-tree.c      |  115 +++--------------------------------------------------
 extent_io.c        |   10 ----
 extent_io.h        |    2 
 file-item.c        |   32 ++------------
 free-space-cache.c |    2 
 inode-item.c       |   73 ---------------------------------
 inode-map.c        |   32 --------------
 qgroup.c           |    4 -
 qgroup.h           |    2 
 root-tree.c        |   27 ------------
 volumes.c          |   69 ++-----------------------------
 volumes.h          |    7 ---
 17 files changed, 38 insertions(+), 497 deletions(-)

ctree.c +1 -1

index 66b146b..a79ed13 100644
@@ -371,7 +371,7 @@ int btrfs_cow_block(struct btrfs_trans_handle *trans,
 /*
  * compare two keys in a memcmp fashion
  */
-int btrfs_comp_keys(struct btrfs_disk_key *disk, struct btrfs_key *k2)
+static int btrfs_comp_keys(struct btrfs_disk_key *disk, struct btrfs_key *k2)
 {
 	struct btrfs_key k1;

ctree.h +0 ~~-43~~

101 lines not on this page · raw message

dir-item.c +5 ~~-92~~

112 lines not on this page · raw message

disk-io.c +8 -6

index 473f7c1..6fb57be 100644
@@ -112,8 +112,8 @@ int verify_tree_block_csum_silent(struct extent_buffer *buf, u16 csum_size)
 	return __csum_tree_block_size(buf, csum_size, 1, 1);
 }
 
-int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf,
-		    int verify)
+static int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf,
+			   int verify)
 {
 	u16 csum_size =
 		btrfs_super_csum_size(root->fs_info->super_copy);

@@ -305,8 +305,9 @@ struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,
 	return NULL;
 }
 
-int write_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root,
-		     struct extent_buffer *eb)
+static int write_tree_block(struct btrfs_trans_handle *trans,
+			    struct btrfs_root *root,
+			    struct extent_buffer *eb)
 {
 	int ret;
 	int dev_nr;

@@ -1179,8 +1180,9 @@ int btrfs_read_dev_super(int fd, struct btrfs_super_block *sb, u64 sb_bytenr)
 	return transid > 0 ? 0 : -1;
 }
 
-int write_dev_supers(struct btrfs_root *root, struct btrfs_super_block *sb,
-		     struct btrfs_device *device)
+static int write_dev_supers(struct btrfs_root *root,
+			    struct btrfs_super_block *sb,
+			    struct btrfs_device *device)
 {
 	u64 bytenr;
 	u32 crc;

disk-io.h +0 -4

index effaa9f..7ebb188 100644
@@ -40,8 +40,6 @@ struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr,
 				      u32 blocksize, u64 parent_transid);
 int readahead_tree_block(struct btrfs_root *root, u64 bytenr, u32 blocksize,
 			 u64 parent_transid);
-int write_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root,
-		     struct extent_buffer *eb);
 struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,
 						   u64 bytenr, u32 blocksize);

@@ -99,8 +97,6 @@ int btrfs_open_device(struct btrfs_device *dev);
 int csum_tree_block_size(struct extent_buffer *buf, u16 csum_sectorsize,
 			 int verify);
 int verify_tree_block_csum_silent(struct extent_buffer *buf, u16 csum_size);
-int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf,
-		    int verify);
 int btrfs_read_buffer(struct extent_buffer *buf, u64 parent_transid);
 #endif

extent-tree.c +8 ~~-107~~

145 lines not on this page · raw message

extent_io.c +2 -8

index 62c05fe..acc4702 100644
@@ -30,8 +30,8 @@
 #include "ctree.h"
 #include "volumes.h"
 
-u64 cache_soft_max = 1024 * 1024 * 256;
-u64 cache_hard_max = 1 * 1024 * 1024 * 1024;
+static u64 cache_soft_max = 1024 * 1024 * 256;
+static u64 cache_hard_max = 1 * 1024 * 1024 * 1024;
 
 void extent_io_tree_init(struct extent_io_tree *tree)
 {

@@ -906,12 +906,6 @@ void copy_extent_buffer(struct extent_buffer *dst, struct extent_buffer *src,
 	memcpy(dst->data + dst_offset, src->data + src_offset, len);
 }
 
-void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
-			  unsigned long src_offset, unsigned long len)
-{
-	memcpy(dst->data + dst_offset, dst->data + src_offset, len);
-}
-
 void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
 			   unsigned long src_offset, unsigned long len)
 {

extent_io.h +0 -2

index 2604dce..ad283cd 100644
@@ -122,8 +122,6 @@ void write_extent_buffer(struct extent_buffer *eb, const void *src,
 void copy_extent_buffer(struct extent_buffer *dst, struct extent_buffer *src,
 			unsigned long dst_offset, unsigned long src_offset,
 			unsigned long len);
-void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
-			  unsigned long src_offset, unsigned long len);
 void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
 			   unsigned long src_offset, unsigned long len);
 void memset_extent_buffer(struct extent_buffer *eb, char c,

file-item.c +5 ~~-27~~

index c2909dc..515df32 100644
@@ -29,12 +29,6 @@
 #define MAX_CSUM_ITEMS(r,size) ((((BTRFS_LEAF_DATA_SIZE(r) - \
 			       sizeof(struct btrfs_item) * 2) / \
 			       size) - 1))
-int btrfs_create_file(struct btrfs_trans_handle *trans,
-		      struct btrfs_root *root, u64 dirid, u64 *objectid)
-{
-	return 0;
-}
-
 int btrfs_insert_file_extent(struct btrfs_trans_handle *trans,
 			     struct btrfs_root *root,
 			     u64 objectid, u64 pos, u64 offset,

@@ -122,10 +116,11 @@ fail:
 	return err;
 }
 
-struct btrfs_csum_item *btrfs_lookup_csum(struct btrfs_trans_handle *trans,
-					  struct btrfs_root *root,
-					  struct btrfs_path *path,
-					  u64 bytenr, int cow)
+static struct btrfs_csum_item *
+btrfs_lookup_csum(struct btrfs_trans_handle *trans,
+		  struct btrfs_root *root,
+		  struct btrfs_path *path,
+		  u64 bytenr, int cow)
 {
 	int ret;
 	struct btrfs_key file_key;

@@ -172,23 +167,6 @@ fail:
 	return ERR_PTR(ret);
 }
 
-int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,
-			     struct btrfs_root *root,
-			     struct btrfs_path *path, u64 objectid,
-			     u64 offset, int mod)
-{
-	int ret;
-	struct btrfs_key file_key;
-	int ins_len = mod < 0 ? -1 : 0;
-	int cow = mod != 0;
-
-	file_key.objectid = objectid;
-	file_key.offset = offset;
-	btrfs_set_key_type(&file_key, BTRFS_EXTENT_DATA_KEY);
-	ret = btrfs_search_slot(trans, root, &file_key, path, ins_len, cow);
-	return ret;
-}
-
 int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
 			  struct btrfs_root *root, u64 alloc_end,
 			  u64 bytenr, char *data, size_t len)

free-space-cache.c +1 -1

index 6c2e189..35edac2 100644
@@ -257,7 +257,7 @@ static int io_ctl_read_bitmap(struct io_ctl *io_ctl,
 }
 
 
-int __load_free_space_cache(struct btrfs_root *root,
+static int __load_free_space_cache(struct btrfs_root *root,
 			    struct btrfs_free_space_ctl *ctl,
 			    struct btrfs_path *path, u64 offset)
 {

inode-item.c +1 ~~-72~~

91 lines not on this page · raw message

inode-map.c +0 ~~-32~~

index f901109..3e138b5 100644
@@ -20,38 +20,6 @@
 #include "disk-io.h"
 #include "transaction.h"
 
-int btrfs_find_highest_inode(struct btrfs_root *root, u64 *objectid)
-{
-	struct btrfs_path *path;
-	int ret;
-	struct extent_buffer *l;
-	struct btrfs_key search_key;
-	struct btrfs_key found_key;
-	int slot;
-
-	path = btrfs_alloc_path();
-	BUG_ON(!path);
-
-	search_key.objectid = (u64)-1;
-	search_key.offset = (u64)-1;
-	ret = btrfs_search_slot(NULL, root, &search_key, path, 0, 0);
-	if (ret < 0)
-		goto error;
-	BUG_ON(ret == 0);
-	if (path->slots[0] > 0) {
-		slot = path->slots[0] - 1;
-		l = path->nodes[0];
-		btrfs_item_key_to_cpu(l, &found_key, slot);
-		*objectid = found_key.objectid;
-	} else {
-		*objectid = BTRFS_FIRST_FREE_OBJECTID;
-	}
-	ret = 0;
-error:
-	btrfs_free_path(path);
-	return ret;
-}
-
 /*
  * walks the btree of allocated inodes and find a hole.
  */

qgroup.c +2 -2

index dafde12..038c4dc 100644
@@ -54,8 +54,8 @@ int qgroup_inherit_size(struct btrfs_qgroup_inherit *p)
 			     2 * p->num_excl_copies);
 }
 
-int qgroup_inherit_realloc(struct btrfs_qgroup_inherit **inherit, int n,
-			   int pos)
+static int
+qgroup_inherit_realloc(struct btrfs_qgroup_inherit **inherit, int n, int pos)
 {
 	struct btrfs_qgroup_inherit *out;
 	int nitems = 0;

qgroup.h +0 -2

index ad14c88..da6d113 100644
@@ -24,8 +24,6 @@
 
 u64 parse_qgroupid(char *p);
 int qgroup_inherit_size(struct btrfs_qgroup_inherit *p);
-int qgroup_inherit_realloc(struct btrfs_qgroup_inherit **inherit,
-			   int incgroups, int inccopies);
 int qgroup_inherit_add_group(struct btrfs_qgroup_inherit **inherit, char *arg);
 int qgroup_inherit_add_copy(struct btrfs_qgroup_inherit **inherit, char *arg,
 			    int type);

root-tree.c +0 ~~-27~~

index 9e5f35f..f8ae8e0 100644
@@ -138,33 +138,6 @@ int btrfs_insert_root(struct btrfs_trans_handle *trans, struct btrfs_root
 	return ret;
 }
 
-int btrfs_del_root(struct btrfs_trans_handle *trans, struct btrfs_root *root,
-		   struct btrfs_key *key)
-{
-	struct btrfs_path *path;
-	int ret;
-	u32 refs;
-	struct btrfs_root_item *ri;
-	struct extent_buffer *leaf;
-
-	path = btrfs_alloc_path();
-	BUG_ON(!path);
-	ret = btrfs_search_slot(trans, root, key, path, -1, 1);
-	if (ret < 0)
-		goto out;
-	BUG_ON(ret != 0);
-	leaf = path->nodes[0];
-	ri = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_root_item);
-
-	refs = btrfs_disk_root_refs(leaf, ri);
-	BUG_ON(refs != 0);
-	ret = btrfs_del_item(trans, root, path);
-out:
-	btrfs_release_path(path);
-	btrfs_free_path(path);
-	return ret;
-}
-
 /*
  * add a btrfs_root_ref item.  type is either BTRFS_ROOT_REF_KEY
  * or BTRFS_ROOT_BACKREF_KEY.

volumes.c +5 ~~-64~~

87 lines not on this page · raw message

volumes.h +0 -7

index e36f2f5..2802cb0 100644
@@ -141,11 +141,6 @@ struct map_lookup {
 #define BTRFS_RAID6_Q_STRIPE ((u64)-1)
 
 
-int btrfs_alloc_dev_extent(struct btrfs_trans_handle *trans,
-			   struct btrfs_device *device,
-			   u64 chunk_tree, u64 chunk_objectid,
-			   u64 chunk_offset,
-			   u64 num_bytes, u64 *start);
 int __btrfs_map_block(struct btrfs_mapping_tree *map_tree, int rw,
 		      u64 logical, u64 *length, u64 *type,
 		      struct btrfs_multi_bio **multi_ret, int mirror_num,

@@ -183,8 +178,6 @@ int btrfs_scan_one_device(int fd, const char *path,
 			  struct btrfs_fs_devices **fs_devices_ret,
 			  u64 *total_devs, u64 super_offset);
 int btrfs_num_copies(struct btrfs_mapping_tree *map_tree, u64 logical, u64 len);
-int btrfs_bootstrap_super_map(struct btrfs_mapping_tree *map_tree,
-			      struct btrfs_fs_devices *fs_devices);
 struct list_head *btrfs_scanned_uuids(void);
 int btrfs_add_system_chunk(struct btrfs_trans_handle *trans,
 			   struct btrfs_root *root, struct btrfs_key *key,

Eric Sandeen

author

2013-08-07 01:05 UTC #2 lore raw

PATCH 2/2 btrfs-progs: mark static & remove unused from non-kernel code

In reply to Eric Sandeen

Mark many functions as static, and remove any resulting dead code.

Signed-off-by Eric Sandeen <[email protected]>

---

 btrfs-convert.c     |    8 ++++----
 btrfs-find-root.c   |    2 +-
 btrfs-list.c        |   10 +++++-----
 btrfs-list.h        |    3 ---
 btrfs-map-logical.c |    4 ++--
 btrfs.c             |    5 +++--
 btrfstune.c         |    6 +++---
 cmds-chunk.c        |    5 +++--
 cmds-qgroup.c       |    4 ++--
 cmds-quota.c        |    2 +-
 cmds-receive.c      |    4 ++--
 cmds-restore.c      |    2 +-
 cmds-scrub.c        |    2 +-
 ioctl-test.c        |    2 +-
 quick-test.c        |    2 +-
 send-test.c         |    2 +-
 send-utils.c        |    9 ---------
 send-utils.h        |    2 --
 utils.c             |   18 ++++++++++--------
 utils.h             |    3 ---
 20 files changed, 41 insertions(+), 54 deletions(-)

btrfs-convert.c +4 -4

index a9ac9a5..7eaa478 100644
@@ -1418,8 +1418,8 @@ fail:
 	return ret;
 }
 
-struct btrfs_root *link_subvol(struct btrfs_root *root, const char *base,
-			       u64 root_objectid)
+static struct btrfs_root *
+link_subvol(struct btrfs_root *root, const char *base, u64 root_objectid)
 {
 	struct btrfs_trans_handle *trans;
 	struct btrfs_fs_info *fs_info = root->fs_info;

@@ -2277,7 +2277,7 @@ err:
 	return ret;
 }
 
-int do_convert(const char *devname, int datacsum, int packing, int noxattr)
+static int do_convert(const char *devname, int datacsum, int packing, int noxattr)
 {
 	int i, ret;
 	int fd = -1;

@@ -2456,7 +2456,7 @@ fail:
 	return -1;
 }
 
-int do_rollback(const char *devname, int force)
+static int do_rollback(const char *devname, int force)
 {
 	int fd = -1;
 	int ret;

btrfs-find-root.c +1 -1

index 989535f..1912f9d 100644
@@ -46,7 +46,7 @@ static void usage()
 		"[ -g search_generation ] [ -l search_level ] <device>\n");
 }
 
-int csum_block(void *buf, u32 len)
+static int csum_block(void *buf, u32 len)
 {
 	char *result;
 	u32 crc = ~(u32)0;

btrfs-list.c +5 -5

index a6902c3..0a9c52c 100644
@@ -46,7 +46,7 @@ struct root_lookup {
 	struct rb_root root;
 };
 
-struct {
+static struct {
 	char	*name;
 	char	*column_name;
 	int	need_print;

@@ -240,7 +240,7 @@ void btrfs_list_free_comparer_set(struct btrfs_list_comparer_set *comp_set)
 	free(comp_set);
 }
 
-int btrfs_list_setup_comparer(struct btrfs_list_comparer_set  **comp_set,
+static int btrfs_list_setup_comparer(struct btrfs_list_comparer_set  **comp_set,
 			      enum btrfs_list_comp_enum comparer,
 			      int is_descending)
 {

@@ -820,7 +820,7 @@ static char *__ino_resolve(int fd, u64 dirid)
  * simple string builder, returning a new string with both
  * dirid and name
  */
-char *build_name(char *dirid, char *name)
+static char *build_name(char *dirid, char *name)
 {
 	char *full;
 	if (!dirid)

@@ -1477,7 +1477,7 @@ static void print_all_volume_info(struct root_lookup *sorted_tree,
 	}
 }
 
-int btrfs_list_subvols(int fd, struct root_lookup *root_lookup)
+static int btrfs_list_subvols(int fd, struct root_lookup *root_lookup)
 {
 	int ret;

@@ -1522,7 +1522,7 @@ int btrfs_list_subvols_print(int fd, struct btrfs_list_filter_set *filter_set,
 	return 0;
 }
 
-char *strdup_or_null(const char *s)
+static char *strdup_or_null(const char *s)
 {
 	if (!s)
 		return NULL;

btrfs-list.h +0 -3

index d3fd9e2..5164467 100644
@@ -150,9 +150,6 @@ int btrfs_list_setup_filter(struct btrfs_list_filter_set **filter_set,
 			    enum btrfs_list_filter_enum filter, u64 data);
 struct btrfs_list_comparer_set *btrfs_list_alloc_comparer_set(void);
 void btrfs_list_free_comparer_set(struct btrfs_list_comparer_set *comp_set);
-int btrfs_list_setup_comparer(struct btrfs_list_comparer_set **comp_set,
-			      enum btrfs_list_comp_enum comparer,
-			      int is_descending);
 
 int btrfs_list_subvols_print(int fd, struct btrfs_list_filter_set *filter_set,
 		       struct btrfs_list_comparer_set *comp_set,

btrfs-map-logical.c +2 -2

index b9635f7..f17d2a0 100644
@@ -37,8 +37,8 @@
  * */
 static FILE *info_file;
 
-struct extent_buffer *debug_read_block(struct btrfs_root *root, u64 bytenr,
-				     u32 blocksize, int copy)
+static struct extent_buffer *
+debug_read_block(struct btrfs_root *root, u64 bytenr, u32 blocksize, int copy)
 {
 	int ret;
 	struct extent_buffer *eb;

btrfs.c +3 -2

index 4e93e13..9e212ce 100644
@@ -106,8 +106,9 @@ parse_command_token(const char *arg, const struct cmd_group *grp)
 	return cmd;
 }
 
-void handle_help_options_next_level(const struct cmd_struct *cmd,
-				    int argc, char **argv)
+static void
+handle_help_options_next_level(const struct cmd_struct *cmd,
+			       int argc, char **argv)
 {
 	if (argc < 2)
 		return;

btrfstune.c +3 -3

index 4db1767..1cf6a68 100644
@@ -34,7 +34,7 @@
 
 static char *device;
 
-int update_seeding_flag(struct btrfs_root *root, int set_flag)
+static int update_seeding_flag(struct btrfs_root *root, int set_flag)
 {
 	struct btrfs_trans_handle *trans;
 	struct btrfs_super_block *disk_super;

@@ -65,7 +65,7 @@ int update_seeding_flag(struct btrfs_root *root, int set_flag)
 	return 0;
 }
 
-int enable_extrefs_flag(struct btrfs_root *root)
+static int enable_extrefs_flag(struct btrfs_root *root)
 {
 	struct btrfs_trans_handle *trans;
 	struct btrfs_super_block *disk_super;

@@ -81,7 +81,7 @@ int enable_extrefs_flag(struct btrfs_root *root)
 	return 0;
 }
 
-int enable_skinny_metadata(struct btrfs_root *root)
+static int enable_skinny_metadata(struct btrfs_root *root)
 {
 	struct btrfs_trans_handle *trans;
 	struct btrfs_super_block *disk_super;

cmds-chunk.c +3 -2

index c20234b..c8234d5 100644
@@ -188,7 +188,8 @@ static struct btrfs_chunk *create_chunk_item(struct chunk_record *record)
 	return ret;
 }
 
-void init_recover_control(struct recover_control *rc, int verbose, int yes)
+static void
+init_recover_control(struct recover_control *rc, int verbose, int yes)
 {
 	memset(rc, 0, sizeof(struct recover_control));
 	cache_tree_init(&rc->chunk);

@@ -204,7 +205,7 @@ void init_recover_control(struct recover_control *rc, int verbose, int yes)
 	rc->yes = yes;
 }
 
-void free_recover_control(struct recover_control *rc)
+static void free_recover_control(struct recover_control *rc)
 {
 	free_block_group_tree(&rc->bg);
 	free_chunk_cache_tree(&rc->chunk);

cmds-qgroup.c +2 -2

index 95aca9b..bf659ab 100644
@@ -104,7 +104,7 @@ static int qgroup_create(int create, int argc, char **argv)
 	return 0;
 }
 
-void print_qgroup_info(u64 objectid, struct btrfs_qgroup_info_item *info)
+static void print_qgroup_info(u64 objectid, struct btrfs_qgroup_info_item *info)
 {
 	printf("%llu/%llu %lld %lld\n", objectid >> 48,
 		objectid & ((1ll << 48) - 1),

@@ -112,7 +112,7 @@ void print_qgroup_info(u64 objectid, struct btrfs_qgroup_info_item *info)
 		btrfs_stack_qgroup_info_exclusive(info));
 }
 
-int list_qgroups(int fd)
+static int list_qgroups(int fd)
 {
 	int ret;
 	struct btrfs_ioctl_search_args args;

cmds-quota.c +1 -1

index 2e2971a..3357780 100644
@@ -30,7 +30,7 @@ static const char * const quota_cmd_group_usage[] = {
 	NULL
 };
 
-int quota_ctl(int cmd, int argc, char **argv)
+static int quota_ctl(int cmd, int argc, char **argv)
 {
 	int ret = 0;
 	int fd;

cmds-receive.c +2 -2

index 7abce76..1630f64 100644
@@ -787,7 +787,7 @@ out:
 }
 
 
-struct btrfs_send_ops send_ops = {
+static struct btrfs_send_ops send_ops = {
 	.subvol = process_subvol,
 	.snapshot = process_snapshot,
 	.mkfile = process_mkfile,

@@ -810,7 +810,7 @@ struct btrfs_send_ops send_ops = {
 	.utimes = process_utimes,
 };
 
-int do_receive(struct btrfs_receive *r, const char *tomnt, int r_fd)
+static int do_receive(struct btrfs_receive *r, const char *tomnt, int r_fd)
 {
 	int ret;
 	char *dest_dir_full_path;

cmds-restore.c +1 -1

index 0871366..38dfcc9 100644
@@ -154,7 +154,7 @@ static int decompress(char *inbuf, char *outbuf, u64 compress_len,
 	return -1;
 }
 
-int next_leaf(struct btrfs_root *root, struct btrfs_path *path)
+static int next_leaf(struct btrfs_root *root, struct btrfs_path *path)
 {
 	int slot;
 	int level = 1;

cmds-scrub.c +1 -1

index bf50650..97b93ce 100644
@@ -1007,7 +1007,7 @@ static struct scrub_file_record *last_dev_scrub(
 	return NULL;
 }
 
-int mkdir_p(char *path)
+static int mkdir_p(char *path)
 {
 	int i;
 	int ret;

ioctl-test.c +1 -1

index 1c27d61..54fc013 100644
@@ -3,7 +3,7 @@
 #include "kerncompat.h"
 #include "ioctl.h"
 
-unsigned long ioctls[] = {
+static unsigned long ioctls[] = {
 	BTRFS_IOC_SNAP_CREATE,
 	BTRFS_IOC_DEFRAG,
 	BTRFS_IOC_RESIZE,

quick-test.c +1 -1

index aaedd19..b12b9ef 100644
@@ -27,7 +27,7 @@
 #include "transaction.h"
 
 /* for testing only */
-int next_key(int i, int max_key) {
+static int next_key(int i, int max_key) {
 	return rand() % max_key;
 	// return i;
 }

send-test.c +1 -1

index 4a53ae2..cb1f57d 100644
@@ -325,7 +325,7 @@ static int print_update_extent(const char *path, u64 offset, u64 len,
 	return 0;
 }
 
-struct btrfs_send_ops send_ops_print = {
+static struct btrfs_send_ops send_ops_print = {
 	.subvol = print_subvol,
 	.snapshot = print_snapshot,
 	.mkfile = print_mkfile,

send-utils.c +0 -9

index 874f8a5..3d562a4 100644
@@ -255,15 +255,6 @@ static int btrfs_subvolid_resolve_sub(int fd, char *path, size_t *path_len,
 	return 0;
 }
 
-void subvol_uuid_search_add(struct subvol_uuid_search *s,
-			    struct subvol_info *si)
-{
-	if (si) {
-		free(si->path);
-		free(si);
-	}
-}
-
 struct subvol_info *subvol_uuid_search(struct subvol_uuid_search *s,
 				       u64 root_id, const u8 *uuid, u64 transid,
 				       const char *path,

send-utils.h +0 -2

index ed1a40e..2607647 100644
@@ -60,8 +60,6 @@ struct subvol_info *subvol_uuid_search(struct subvol_uuid_search *s,
 				       u64 root_id, const u8 *uuid, u64 transid,
 				       const char *path,
 				       enum subvol_search_type type);
-void subvol_uuid_search_add(struct subvol_uuid_search *s,
-			    struct subvol_info *si);
 
 int btrfs_subvolid_resolve(int fd, char *path, size_t path_len, u64 subvol_id);

utils.c +10 -8

index e522361..71bb73e 100644
@@ -751,7 +751,7 @@ int open_path_or_dev_mnt(const char *path)
 }
 
 /* checks if a device is a loop device */
-int is_loop_device (const char* device) {
+static int is_loop_device (const char* device) {
 	struct stat statbuf;
 
 	if(stat(device, &statbuf) < 0)

@@ -764,7 +764,8 @@ int is_loop_device (const char* device) {
 
 /* Takes a loop device path (e.g. /dev/loop0) and returns
  * the associated file (e.g. /images/my_btrfs.img) */
-int resolve_loop_device(const char* loop_dev, char* loop_file, int max_len)
+static int
+resolve_loop_device(const char* loop_dev, char* loop_file, int max_len)
 {
 	int ret;
 	FILE *f;

@@ -790,7 +791,7 @@ int resolve_loop_device(const char* loop_dev, char* loop_file, int max_len)
 /* Checks whether a and b are identical or device
  * files associated with the same block device
  */
-int is_same_blk_file(const char* a, const char* b)
+static int is_same_blk_file(const char* a, const char* b)
 {
 	struct stat st_buf_a, st_buf_b;
 	char real_a[PATH_MAX];

@@ -837,7 +838,7 @@ int is_same_blk_file(const char* a, const char* b)
  * if one file is a loop device that uses the other
  * file.
  */
-int is_same_loop_file(const char* a, const char* b)
+static int is_same_loop_file(const char* a, const char* b)
 {
 	char res_a[PATH_MAX];
 	char res_b[PATH_MAX];

@@ -877,7 +878,7 @@ int is_same_loop_file(const char* a, const char* b)
 }
 
 /* Checks if a file exists and is a block or regular file*/
-int is_existing_blk_or_reg_file(const char* filename)
+static int is_existing_blk_or_reg_file(const char* filename)
 {
 	struct stat st_buf;

@@ -894,7 +895,8 @@ int is_existing_blk_or_reg_file(const char* filename)
 /* Checks if a file is used (directly or indirectly via a loop device)
  * by a device in fs_devices
  */
-int blk_file_in_dev_list(struct btrfs_fs_devices* fs_devices, const char* file)
+static int
+blk_file_in_dev_list(struct btrfs_fs_devices* fs_devices, const char* file)
 {
 	int ret;
 	struct list_head *head;

@@ -1524,7 +1526,7 @@ int open_file_or_dir(const char *fname)
 	return fd;
 }
 
-int get_device_info(int fd, u64 devid,
+static int get_device_info(int fd, u64 devid,
 		    struct btrfs_ioctl_dev_info_args *di_args)
 {
 	int ret;

@@ -1648,7 +1650,7 @@ static inline void translate(char *f, char *t)
  * Checks if the swap device.
  * Returns 1 if swap device, < 0 on error or 0 if not swap device.
  */
-int is_swap_device(const char *file)
+static int is_swap_device(const char *file)
 {
 	FILE	*f;
 	struct stat	st_buf;

utils.h +0 -3

index d20f97f..693c5ad 100644
@@ -57,8 +57,6 @@ int get_mountpt(char *dev, char *mntpt, size_t size);
 int btrfs_scan_block_devices(int run_ioctl);
 u64 parse_size(char *s);
 int open_file_or_dir(const char *fname);
-int get_device_info(int fd, u64 devid,
-		    struct btrfs_ioctl_dev_info_args *di_args);
 int get_fs_info(char *path, struct btrfs_ioctl_fs_info_args *fi_args,
 		struct btrfs_ioctl_dev_info_args **di_ret);
 int get_label(const char *btrfs_dev);

@@ -67,7 +65,6 @@ int set_label(const char *btrfs_dev, const char *label);
 char *__strncpy__null(char *dest, const char *src, size_t n);
 int is_block_device(const char *file);
 int open_path_or_dev_mnt(const char *path);
-int is_swap_device(const char *file);
 u64 btrfs_device_size(int fd, struct stat *st);
 /* Helper to always get proper size of the destination string */
 #define strncpy_null(dest, src) __strncpy__null(dest, src, sizeof(dest))

Eric Sandeen

author

2013-08-07 03:49 UTC #3 lore raw

Re: [PATCH 2/2] btrfs-progs: mark static & remove unused from non-kernel code

Quoted 4 lines · Eric Sandeen

Mark many functions as static, and remove any resulting dead code.
Signed-off-by Eric Sandeen <[email protected]>
---

...

Actually, what the heck was this (note, this patch was against kdave's integration tree):

Quoted 7 lines

send-utils.c +0 -0

index 874f8a5..3d562a4 100644
@@ -255,15 +255,6 @@ static int btrfs_subvolid_resolve_sub(int fd, char *path, size_t *path_len,
 	return 0;
 }

send-utils.c static int btrfs_subvolid_resolve_sub(int fd, char *path, size_t *path_len, · line 266

Quoted 10 lines

send-utils.c +0 -9

 
-void subvol_uuid_search_add(struct subvol_uuid_search *s,
-			    struct subvol_info *si)
-{
-	if (si) {
-		free(si->path);
-		free(si);
-	}
-}
-

That code above came into being with "[PATCH v4 3/5] Btrfs-progs: use UUID tree for send/receive" -

void subvol_uuid_search_add(struct subvol_uuid_search *s,
struct subvol_info *si)
{
- int cnt;
-
- tree_insert(&s->root_id_subvols, si, subvol_search_by_root_id);
- tree_insert(&s->path_subvols, si, subvol_search_by_path);
-
- cnt = count_bytes(si->uuid, BTRFS_UUID_SIZE, 0);
- if (cnt != BTRFS_UUID_SIZE)
- tree_insert(&s->local_subvols, si, subvol_search_by_uuid);
- cnt = count_bytes(si->received_uuid, BTRFS_UUID_SIZE, 0);
- if (cnt != BTRFS_UUID_SIZE)
- tree_insert(&s->received_subvols, si,
- subvol_search_by_received_uuid);
+ if (si) {
+ free(si->path);
+ free(si);
+ }
}

is that, um, really as intended, or did something get misapplied somewhere?

-Eric

Stefan Behrens

2013-08-07 07:54 UTC #4 lore raw

Re: [PATCH 2/2] btrfs-progs: mark static & remove unused from non-kernel code

Quoted 50 lines · Eric Sandeen

Quoted 4 lines · Eric Sandeen
Mark many functions as static, and remove any resulting dead code.
Signed-off-by Eric Sandeen <[email protected]>
---
...
Actually, what the heck was this (note, this patch was against kdave's integration tree):
Quoted 7 lines
send-utils.c +0 -0
index 874f8a5..3d562a4 100644
@@ -255,15 +255,6 @@ static int btrfs_subvolid_resolve_sub(int fd, char *path, size_t *path_len,
 	return 0;
 }
send-utils.c static int btrfs_subvolid_resolve_sub(int fd, char *path, size_t *path_len, · line 266
Quoted 10 lines
send-utils.c +0 -9
 
-void subvol_uuid_search_add(struct subvol_uuid_search *s,
-			    struct subvol_info *si)
-{
-	if (si) {
-		free(si->path);
-		free(si);
-	}
-}
-
That code above came into being with "[PATCH v4 3/5] Btrfs-progs: use UUID tree for send/receive" -
void subvol_uuid_search_add(struct subvol_uuid_search *s,
(quoted diff) +4 ~~-12~~
 			    struct subvol_info *si)
 {
-	int cnt;
-
-	tree_insert(&s->root_id_subvols, si, subvol_search_by_root_id);
-	tree_insert(&s->path_subvols, si, subvol_search_by_path);
-
-	cnt = count_bytes(si->uuid, BTRFS_UUID_SIZE, 0);
-	if (cnt != BTRFS_UUID_SIZE)
-		tree_insert(&s->local_subvols, si, subvol_search_by_uuid);
-	cnt = count_bytes(si->received_uuid, BTRFS_UUID_SIZE, 0);
-	if (cnt != BTRFS_UUID_SIZE)
-		tree_insert(&s->received_subvols, si,
-				subvol_search_by_received_uuid);
+	if (si) {
+		free(si->path);
+		free(si);
+	}
 }

Quoted 1 line

is that, um, really as intended, or did something get misapplied somewhere?

That was as intended. subvol_uuid_search_add() was not needed anymore after the UUID tree patch. But it's part of the btrfs library interface which I didn't want to break.

Before the UUID tree patch, the send/receive code was creating a database (on the heap) of UUIDs, subvols and paths on each invocation. The ..._add() function was part of that code. This database building code was completely removed and replaced by code that uses the tree-search ioctl (this was possible after the addition of the UUID tree to the on-disk filesystem).

But subvol_uuid_search_add() is one of the exported btrfslib functions, therefore I tried to stay compatible and to not break the interface.

To add a BTRFSLIB_VERSION define was proposed some time ago which is updated with every interface change. I support this idea.

First thing I would like to change in the interface would be to add a "btrfs_" prefix to all exported symbols. Unfortunately this is a 30k+ lines patch, I wrote a tiny sed script for it some time ago and this huge patch was the result which I then throw away afterwards.

Eric Sandeen

author

2013-08-07 15:18 UTC #5 lore raw

Re: [PATCH 2/2] btrfs-progs: mark static & remove unused from non-kernel code

Quoted 51 lines · Stefan Behrens

Quoted 50 lines · Eric Sandeen
Quoted 4 lines · Eric Sandeen
Mark many functions as static, and remove any resulting dead code.
Signed-off-by Eric Sandeen <[email protected]>
---
...
Actually, what the heck was this (note, this patch was against kdave's integration tree):
Quoted 7 lines
send-utils.c +0 -0
index 874f8a5..3d562a4 100644
@@ -255,15 +255,6 @@ static int btrfs_subvolid_resolve_sub(int fd, char *path, size_t *path_len,
 	return 0;
 }
send-utils.c static int btrfs_subvolid_resolve_sub(int fd, char *path, size_t *path_len, · line 266
Quoted 10 lines
send-utils.c +0 -9
 
-void subvol_uuid_search_add(struct subvol_uuid_search *s,
-			    struct subvol_info *si)
-{
-	if (si) {
-		free(si->path);
-		free(si);
-	}
-}
-
That code above came into being with "[PATCH v4 3/5] Btrfs-progs: use UUID tree for send/receive" -
void subvol_uuid_search_add(struct subvol_uuid_search *s,
(quoted diff) +4 ~~-12~~
 			    struct subvol_info *si)
 {
-	int cnt;
-
-	tree_insert(&s->root_id_subvols, si, subvol_search_by_root_id);
-	tree_insert(&s->path_subvols, si, subvol_search_by_path);
-
-	cnt = count_bytes(si->uuid, BTRFS_UUID_SIZE, 0);
-	if (cnt != BTRFS_UUID_SIZE)
-		tree_insert(&s->local_subvols, si, subvol_search_by_uuid);
-	cnt = count_bytes(si->received_uuid, BTRFS_UUID_SIZE, 0);
-	if (cnt != BTRFS_UUID_SIZE)
-		tree_insert(&s->received_subvols, si,
-				subvol_search_by_received_uuid);
+	if (si) {
+		free(si->path);
+		free(si);
+	}
 }

Quoted 5 lines

Quoted 1 line
is that, um, really as intended, or did something get misapplied somewhere?
That was as intended. subvol_uuid_search_add() was not needed anymore after the UUID tree patch. But it's part of the btrfs library interface which I didn't want to break.

so you have a subvol_uuid_search_add() which . . . frees things?

That's what was so confusing to me. Ok, so it's an almost-no-op function to maintain a symmetric interface, and the only remnant is to free the things passed to it...

A comment to that effect would have been useful, I guess. To a casual code-reader, it just looked like a mistake.

And isn't it still a mistake? I think it used to be that subvol_uuid_search_init() would allocate the memory which must be freed, but that's no longer the case, right? So under what circumstances is it correct to call subvol_uuid_search_add() which frees those pointers?

I'm probably missing something.

Quoted 9 lines

Before the UUID tree patch, the send/receive code was creating a database (on the heap) of UUIDs, subvols and paths on each invocation. The ..._add() function was part of that code. This database building code was completely removed and replaced by code that uses the tree-search ioctl (this was possible after the addition of the UUID tree to the on-disk filesystem).
But subvol_uuid_search_add() is one of the exported btrfslib functions, therefore I tried to stay compatible and to not break the interface.

Oh, hohum.

Quoted 2 lines

To add a BTRFSLIB_VERSION define was proposed some time ago which is updated with every interface change. I support this idea.

*nod*

Getting things organized in the tree, with a libbtrfs/ might help, too.

thanks,
-Eric

Quoted 5 lines

First thing I would like to change in the interface would be to add a "btrfs_" prefix to all exported symbols. Unfortunately this is a 30k+ lines patch, I wrote a tiny sed script for it some time ago and this huge patch was the result which I then throw away afterwards.

David Sterba

2013-08-09 14:10 UTC #6 lore raw

Re: [PATCH 2/2] btrfs-progs: mark static & remove unused from non-kernel code

Quoted 4 lines · Eric Sandeen

And isn't it still a mistake? I think it used to be that subvol_uuid_search_init() would allocate the memory which must be freed, but that's no longer the case, right? So under what circumstances is it correct to call subvol_uuid_search_add() which frees those pointers?

Looks like the memory management is internal to the subvol_uuid* functions, now _init does not allocate and I don't see why _add should call free. All users of subvol_uuid_search() free the memory themselves (in current code).

Seems that subvol_uuid_search_add was exported without any concern that it could be part of the library interface.

We don't have library ABI versioning in place, so I suggest to keep the function there for compatibility with current code (though I'm not aware of any external users of the _add function), but drop th free() calls and put a "don't use" comment.

david

Stefan Behrens

2013-08-09 14:39 UTC #7 lore raw

Re: [PATCH 2/2] btrfs-progs: mark static & remove unused from non-kernel code

Quoted 11 lines · David Sterba

Quoted 4 lines · Eric Sandeen
And isn't it still a mistake? I think it used to be that subvol_uuid_search_init() would allocate the memory which must be freed, but that's no longer the case, right? So under what circumstances is it correct to call subvol_uuid_search_add() which frees those pointers?
Looks like the memory management is internal to the subvol_uuid* functions, now _init does not allocate and I don't see why _add should call free. All users of subvol_uuid_search() free the memory themselves (in current code).

Quoted 8 lines

Seems that subvol_uuid_search_add was exported without any concern that it could be part of the library interface.
We don't have library ABI versioning in place, so I suggest to keep the function there for compatibility with current code (though I'm not aware of any external users of the _add function), but drop th free() calls and put a "don't use" comment.

Callers of the subvol_uuid interface (like Btrfs receive) allocate the memory for newly created items (this is the case after receiving a subvolume) and add them to the database with the _add function. _add() stores the pointer and the caller mustn't free() the item. This was/is the interface.

We don't have this database anymore, we don't keep the items that are added. Since it was not allowed to call free() for items that have been added, _add() must call free() now.

Eric Sandeen

author

2013-08-09 20:20 UTC #8 lore raw

PATCH v2 2/2 btrfs-progs: mark static & remove unused from non-kernel code

In reply to Eric Sandeen

Mark many functions as static, and remove any resulting dead code.

Signed-off-by Eric Sandeen <[email protected]>

---

V2: Keep the "special" subvol_uuid_search_add()-which-only-frees-pointers because I'm picking my battles :)

 btrfs-convert.c     |    8 ++++----
 btrfs-find-root.c   |    2 +-
 btrfs-list.c        |   10 +++++-----
 btrfs-list.h        |    3 ---
 btrfs-map-logical.c |    4 ++--
 btrfs.c             |    5 +++--
 btrfstune.c         |    6 +++---
 cmds-chunk.c        |    5 +++--
 cmds-qgroup.c       |    4 ++--
 cmds-quota.c        |    2 +-
 cmds-receive.c      |    4 ++--
 cmds-restore.c      |    2 +-
 cmds-scrub.c        |    2 +-
 ioctl-test.c        |    2 +-
 quick-test.c        |    2 +-
 send-test.c         |    2 +-
 utils.c             |   18 ++++++++++--------
 utils.h             |    3 ---
 20 files changed, 41 insertions(+), 54 deletions(-)

btrfs-convert.c +4 -4

index a9ac9a5..7eaa478 100644
@@ -1418,8 +1418,8 @@ fail:
 	return ret;
 }
 
-struct btrfs_root *link_subvol(struct btrfs_root *root, const char *base,
-			       u64 root_objectid)
+static struct btrfs_root *
+link_subvol(struct btrfs_root *root, const char *base, u64 root_objectid)
 {
 	struct btrfs_trans_handle *trans;
 	struct btrfs_fs_info *fs_info = root->fs_info;

@@ -2277,7 +2277,7 @@ err:
 	return ret;
 }
 
-int do_convert(const char *devname, int datacsum, int packing, int noxattr)
+static int do_convert(const char *devname, int datacsum, int packing, int noxattr)
 {
 	int i, ret;
 	int fd = -1;

@@ -2456,7 +2456,7 @@ fail:
 	return -1;
 }
 
-int do_rollback(const char *devname, int force)
+static int do_rollback(const char *devname, int force)
 {
 	int fd = -1;
 	int ret;

btrfs-find-root.c +1 -1

index 989535f..1912f9d 100644
@@ -46,7 +46,7 @@ static void usage()
 		"[ -g search_generation ] [ -l search_level ] <device>\n");
 }
 
-int csum_block(void *buf, u32 len)
+static int csum_block(void *buf, u32 len)
 {
 	char *result;
 	u32 crc = ~(u32)0;

btrfs-list.c +5 -5

index a6902c3..0a9c52c 100644
@@ -46,7 +46,7 @@ struct root_lookup {
 	struct rb_root root;
 };
 
-struct {
+static struct {
 	char	*name;
 	char	*column_name;
 	int	need_print;

@@ -240,7 +240,7 @@ void btrfs_list_free_comparer_set(struct btrfs_list_comparer_set *comp_set)
 	free(comp_set);
 }
 
-int btrfs_list_setup_comparer(struct btrfs_list_comparer_set  **comp_set,
+static int btrfs_list_setup_comparer(struct btrfs_list_comparer_set  **comp_set,
 			      enum btrfs_list_comp_enum comparer,
 			      int is_descending)
 {

@@ -820,7 +820,7 @@ static char *__ino_resolve(int fd, u64 dirid)
  * simple string builder, returning a new string with both
  * dirid and name
  */
-char *build_name(char *dirid, char *name)
+static char *build_name(char *dirid, char *name)
 {
 	char *full;
 	if (!dirid)

@@ -1477,7 +1477,7 @@ static void print_all_volume_info(struct root_lookup *sorted_tree,
 	}
 }
 
-int btrfs_list_subvols(int fd, struct root_lookup *root_lookup)
+static int btrfs_list_subvols(int fd, struct root_lookup *root_lookup)
 {
 	int ret;

@@ -1522,7 +1522,7 @@ int btrfs_list_subvols_print(int fd, struct btrfs_list_filter_set *filter_set,
 	return 0;
 }
 
-char *strdup_or_null(const char *s)
+static char *strdup_or_null(const char *s)
 {
 	if (!s)
 		return NULL;

btrfs-list.h +0 -3

index d3fd9e2..5164467 100644
@@ -150,9 +150,6 @@ int btrfs_list_setup_filter(struct btrfs_list_filter_set **filter_set,
 			    enum btrfs_list_filter_enum filter, u64 data);
 struct btrfs_list_comparer_set *btrfs_list_alloc_comparer_set(void);
 void btrfs_list_free_comparer_set(struct btrfs_list_comparer_set *comp_set);
-int btrfs_list_setup_comparer(struct btrfs_list_comparer_set **comp_set,
-			      enum btrfs_list_comp_enum comparer,
-			      int is_descending);
 
 int btrfs_list_subvols_print(int fd, struct btrfs_list_filter_set *filter_set,
 		       struct btrfs_list_comparer_set *comp_set,

btrfs-map-logical.c +2 -2

index b9635f7..f17d2a0 100644
@@ -37,8 +37,8 @@
  * */
 static FILE *info_file;
 
-struct extent_buffer *debug_read_block(struct btrfs_root *root, u64 bytenr,
-				     u32 blocksize, int copy)
+static struct extent_buffer *
+debug_read_block(struct btrfs_root *root, u64 bytenr, u32 blocksize, int copy)
 {
 	int ret;
 	struct extent_buffer *eb;

btrfs.c +3 -2

index 4e93e13..9e212ce 100644
@@ -106,8 +106,9 @@ parse_command_token(const char *arg, const struct cmd_group *grp)
 	return cmd;
 }
 
-void handle_help_options_next_level(const struct cmd_struct *cmd,
-				    int argc, char **argv)
+static void
+handle_help_options_next_level(const struct cmd_struct *cmd,
+			       int argc, char **argv)
 {
 	if (argc < 2)
 		return;

btrfstune.c +3 -3

index 4db1767..1cf6a68 100644
@@ -34,7 +34,7 @@
 
 static char *device;
 
-int update_seeding_flag(struct btrfs_root *root, int set_flag)
+static int update_seeding_flag(struct btrfs_root *root, int set_flag)
 {
 	struct btrfs_trans_handle *trans;
 	struct btrfs_super_block *disk_super;

@@ -65,7 +65,7 @@ int update_seeding_flag(struct btrfs_root *root, int set_flag)
 	return 0;
 }
 
-int enable_extrefs_flag(struct btrfs_root *root)
+static int enable_extrefs_flag(struct btrfs_root *root)
 {
 	struct btrfs_trans_handle *trans;
 	struct btrfs_super_block *disk_super;

@@ -81,7 +81,7 @@ int enable_extrefs_flag(struct btrfs_root *root)
 	return 0;
 }
 
-int enable_skinny_metadata(struct btrfs_root *root)
+static int enable_skinny_metadata(struct btrfs_root *root)
 {
 	struct btrfs_trans_handle *trans;
 	struct btrfs_super_block *disk_super;

cmds-chunk.c +3 -2

index c20234b..c8234d5 100644
@@ -188,7 +188,8 @@ static struct btrfs_chunk *create_chunk_item(struct chunk_record *record)
 	return ret;
 }
 
-void init_recover_control(struct recover_control *rc, int verbose, int yes)
+static void
+init_recover_control(struct recover_control *rc, int verbose, int yes)
 {
 	memset(rc, 0, sizeof(struct recover_control));
 	cache_tree_init(&rc->chunk);

@@ -204,7 +205,7 @@ void init_recover_control(struct recover_control *rc, int verbose, int yes)
 	rc->yes = yes;
 }
 
-void free_recover_control(struct recover_control *rc)
+static void free_recover_control(struct recover_control *rc)
 {
 	free_block_group_tree(&rc->bg);
 	free_chunk_cache_tree(&rc->chunk);

cmds-qgroup.c +2 -2

index 95aca9b..bf659ab 100644
@@ -104,7 +104,7 @@ static int qgroup_create(int create, int argc, char **argv)
 	return 0;
 }
 
-void print_qgroup_info(u64 objectid, struct btrfs_qgroup_info_item *info)
+static void print_qgroup_info(u64 objectid, struct btrfs_qgroup_info_item *info)
 {
 	printf("%llu/%llu %lld %lld\n", objectid >> 48,
 		objectid & ((1ll << 48) - 1),

@@ -112,7 +112,7 @@ void print_qgroup_info(u64 objectid, struct btrfs_qgroup_info_item *info)
 		btrfs_stack_qgroup_info_exclusive(info));
 }
 
-int list_qgroups(int fd)
+static int list_qgroups(int fd)
 {
 	int ret;
 	struct btrfs_ioctl_search_args args;

cmds-quota.c +1 -1

index 2e2971a..3357780 100644
@@ -30,7 +30,7 @@ static const char * const quota_cmd_group_usage[] = {
 	NULL
 };
 
-int quota_ctl(int cmd, int argc, char **argv)
+static int quota_ctl(int cmd, int argc, char **argv)
 {
 	int ret = 0;
 	int fd;

cmds-receive.c +2 -2

index 7abce76..1630f64 100644
@@ -787,7 +787,7 @@ out:
 }
 
 
-struct btrfs_send_ops send_ops = {
+static struct btrfs_send_ops send_ops = {
 	.subvol = process_subvol,
 	.snapshot = process_snapshot,
 	.mkfile = process_mkfile,

@@ -810,7 +810,7 @@ struct btrfs_send_ops send_ops = {
 	.utimes = process_utimes,
 };
 
-int do_receive(struct btrfs_receive *r, const char *tomnt, int r_fd)
+static int do_receive(struct btrfs_receive *r, const char *tomnt, int r_fd)
 {
 	int ret;
 	char *dest_dir_full_path;

cmds-restore.c +1 -1

index 0871366..38dfcc9 100644
@@ -154,7 +154,7 @@ static int decompress(char *inbuf, char *outbuf, u64 compress_len,
 	return -1;
 }
 
-int next_leaf(struct btrfs_root *root, struct btrfs_path *path)
+static int next_leaf(struct btrfs_root *root, struct btrfs_path *path)
 {
 	int slot;
 	int level = 1;

cmds-scrub.c +1 -1

index bf50650..97b93ce 100644
@@ -1007,7 +1007,7 @@ static struct scrub_file_record *last_dev_scrub(
 	return NULL;
 }
 
-int mkdir_p(char *path)
+static int mkdir_p(char *path)
 {
 	int i;
 	int ret;

ioctl-test.c +1 -1

index 1c27d61..54fc013 100644
@@ -3,7 +3,7 @@
 #include "kerncompat.h"
 #include "ioctl.h"
 
-unsigned long ioctls[] = {
+static unsigned long ioctls[] = {
 	BTRFS_IOC_SNAP_CREATE,
 	BTRFS_IOC_DEFRAG,
 	BTRFS_IOC_RESIZE,

quick-test.c +1 -1

index aaedd19..b12b9ef 100644
@@ -27,7 +27,7 @@
 #include "transaction.h"
 
 /* for testing only */
-int next_key(int i, int max_key) {
+static int next_key(int i, int max_key) {
 	return rand() % max_key;
 	// return i;
 }

send-test.c +1 -1

index 4a53ae2..cb1f57d 100644
@@ -325,7 +325,7 @@ static int print_update_extent(const char *path, u64 offset, u64 len,
 	return 0;
 }
 
-struct btrfs_send_ops send_ops_print = {
+static struct btrfs_send_ops send_ops_print = {
 	.subvol = print_subvol,
 	.snapshot = print_snapshot,
 	.mkfile = print_mkfile,

utils.c +10 -8

index e522361..71bb73e 100644
@@ -751,7 +751,7 @@ int open_path_or_dev_mnt(const char *path)
 }
 
 /* checks if a device is a loop device */
-int is_loop_device (const char* device) {
+static int is_loop_device (const char* device) {
 	struct stat statbuf;
 
 	if(stat(device, &statbuf) < 0)

@@ -764,7 +764,8 @@ int is_loop_device (const char* device) {
 
 /* Takes a loop device path (e.g. /dev/loop0) and returns
  * the associated file (e.g. /images/my_btrfs.img) */
-int resolve_loop_device(const char* loop_dev, char* loop_file, int max_len)
+static int
+resolve_loop_device(const char* loop_dev, char* loop_file, int max_len)
 {
 	int ret;
 	FILE *f;

@@ -790,7 +791,7 @@ int resolve_loop_device(const char* loop_dev, char* loop_file, int max_len)
 /* Checks whether a and b are identical or device
  * files associated with the same block device
  */
-int is_same_blk_file(const char* a, const char* b)
+static int is_same_blk_file(const char* a, const char* b)
 {
 	struct stat st_buf_a, st_buf_b;
 	char real_a[PATH_MAX];

@@ -837,7 +838,7 @@ int is_same_blk_file(const char* a, const char* b)
  * if one file is a loop device that uses the other
  * file.
  */
-int is_same_loop_file(const char* a, const char* b)
+static int is_same_loop_file(const char* a, const char* b)
 {
 	char res_a[PATH_MAX];
 	char res_b[PATH_MAX];

@@ -877,7 +878,7 @@ int is_same_loop_file(const char* a, const char* b)
 }
 
 /* Checks if a file exists and is a block or regular file*/
-int is_existing_blk_or_reg_file(const char* filename)
+static int is_existing_blk_or_reg_file(const char* filename)
 {
 	struct stat st_buf;

@@ -894,7 +895,8 @@ int is_existing_blk_or_reg_file(const char* filename)
 /* Checks if a file is used (directly or indirectly via a loop device)
  * by a device in fs_devices
  */
-int blk_file_in_dev_list(struct btrfs_fs_devices* fs_devices, const char* file)
+static int
+blk_file_in_dev_list(struct btrfs_fs_devices* fs_devices, const char* file)
 {
 	int ret;
 	struct list_head *head;

@@ -1524,7 +1526,7 @@ int open_file_or_dir(const char *fname)
 	return fd;
 }
 
-int get_device_info(int fd, u64 devid,
+static int get_device_info(int fd, u64 devid,
 		    struct btrfs_ioctl_dev_info_args *di_args)
 {
 	int ret;

@@ -1648,7 +1650,7 @@ static inline void translate(char *f, char *t)
  * Checks if the swap device.
  * Returns 1 if swap device, < 0 on error or 0 if not swap device.
  */
-int is_swap_device(const char *file)
+static int is_swap_device(const char *file)
 {
 	FILE	*f;
 	struct stat	st_buf;

utils.h +0 -3

index d20f97f..693c5ad 100644
@@ -57,8 +57,6 @@ int get_mountpt(char *dev, char *mntpt, size_t size);
 int btrfs_scan_block_devices(int run_ioctl);
 u64 parse_size(char *s);
 int open_file_or_dir(const char *fname);
-int get_device_info(int fd, u64 devid,
-		    struct btrfs_ioctl_dev_info_args *di_args);
 int get_fs_info(char *path, struct btrfs_ioctl_fs_info_args *fi_args,
 		struct btrfs_ioctl_dev_info_args **di_ret);
 int get_label(const char *btrfs_dev);

@@ -67,7 +65,6 @@ int set_label(const char *btrfs_dev, const char *label);
 char *__strncpy__null(char *dest, const char *src, size_t n);
 int is_block_device(const char *file);
 int open_path_or_dev_mnt(const char *path);
-int is_swap_device(const char *file);
 u64 btrfs_device_size(int fd, struct stat *st);
 /* Helper to always get proper size of the destination string */
 #define strncpy_null(dest, src) __strncpy__null(dest, src, sizeof(dest))

David Sterba

2013-08-09 22:48 UTC #9 lore raw

Re: [PATCH 2/2 V2] btrfs-progs: mark static & remove unused from non-kernel code

Quoted 1 line · Eric Sandeen

Mark many functions as static, and remove any resulting dead code.

Thanks.

btrfs-convert.c fail: · line 1422

Quoted 4 lines

btrfs-convert.c +2 -2

-struct btrfs_root *link_subvol(struct btrfs_root *root, const char *base,
-			       u64 root_objectid)
+static struct btrfs_root *
+link_subvol(struct btrfs_root *root, const char *base, u64 root_objectid)

Please keep the function defintion style if possible. I've fixed that at commit time, no need to resend.

david

Eric Sandeen

author

2013-08-09 23:16 UTC #10 lore raw

Re: [PATCH 2/2 V2] btrfs-progs: mark static & remove unused from non-kernel code

Quoted 5 lines · David Sterba

Quoted 1 line · Eric Sandeen
Mark many functions as static, and remove any resulting dead code.
Thanks.

Quoted 7 lines

btrfs-convert.c fail: · line 1422
Quoted 4 lines
btrfs-convert.c +2 -2
-struct btrfs_root *link_subvol(struct btrfs_root *root, const char *base,
-			       u64 root_objectid)
+static struct btrfs_root *
+link_subvol(struct btrfs_root *root, const char *base, u64 root_objectid)
Please keep the function defintion style if possible. I've fixed that at commit time, no need to resend.

Ok, fair enough - so preferred is

<lots of type stuff> function(some args . . ,
. . . more args . . ., . . . last args)

? sorry, old xfs habits die hard. ;)

-Eric

Quoted 2 lines

david

David Sterba

2013-08-09 23:25 UTC #11 lore raw

Re: [PATCH 2/2 V2] btrfs-progs: mark static & remove unused from non-kernel code

Quoted 5 lines · Eric Sandeen

Ok, fair enough - so preferred is
<lots of type stuff> function(some args . . ,
. . . more args . . ., . . . last args)

Yeah something like that, bonus points if variable type and name are on the same line.

Quoted 1 line

? sorry, old xfs habits die hard. ;)

sure, np ;)