marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
master
Eric Sandeen 2013-08-09 15:20:47 -05:00 committed by David Sterba
parent 116123c5f2
commit fa25b35dcc
18 changed files with 43 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
btrfs-convert.c
View File

@ -1418,8 +1418,8 @@ fail:
return ret; return ret;
} }
struct btrfs_root *link_subvol(struct btrfs_root *root, const char *base, static struct btrfs_root * link_subvol(struct btrfs_root *root,
u64 root_objectid) const char *base, u64 root_objectid)
{ {
struct btrfs_trans_handle *trans; struct btrfs_trans_handle *trans;
struct btrfs_fs_info *fs_info = root->fs_info; struct btrfs_fs_info *fs_info = root->fs_info;
@ -2277,7 +2277,8 @@ err:
return ret; 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 i, ret;
int fd = -1; int fd = -1;
@ -2456,7 +2457,7 @@ fail:
return -1; return -1;
} }
int do_rollback(const char *devname, int force) static int do_rollback(const char *devname, int force)
{ {
int fd = -1; int fd = -1;
int ret; int ret;

2
btrfs-find-root.c
View File

@ -46,7 +46,7 @@ static void usage()
"[ -g search_generation ] [ -l search_level ] <device>\n"); "[ -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; char *result;
u32 crc = ~(u32)0; u32 crc = ~(u32)0;

13
btrfs-list.c
View File

@ -46,7 +46,7 @@ struct root_lookup {
struct rb_root root; struct rb_root root;
}; };
struct { static struct {
char *name; char *name;
char *column_name; char *column_name;
int need_print; int need_print;
@ -240,9 +240,8 @@ void btrfs_list_free_comparer_set(struct btrfs_list_comparer_set *comp_set)
free(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, enum btrfs_list_comp_enum comparer, int is_descending)
int is_descending)
{ {
struct btrfs_list_comparer_set *set = *comp_set; struct btrfs_list_comparer_set *set = *comp_set;
int size; int size;
@ -820,7 +819,7 @@ static char *__ino_resolve(int fd, u64 dirid)
* simple string builder, returning a new string with both * simple string builder, returning a new string with both
* dirid and name * dirid and name
*/ */
char *build_name(char *dirid, char *name) static char *build_name(char *dirid, char *name)
{ {
char *full; char *full;
if (!dirid) if (!dirid)
@ -1477,7 +1476,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; int ret;
@ -1522,7 +1521,7 @@ int btrfs_list_subvols_print(int fd, struct btrfs_list_filter_set *filter_set,
return 0; return 0;
} }
char *strdup_or_null(const char *s) static char *strdup_or_null(const char *s)
{ {
if (!s) if (!s)
return NULL; return NULL;

3
btrfs-list.h
View File

@ -150,9 +150,6 @@ int btrfs_list_setup_filter(struct btrfs_list_filter_set **filter_set,
enum btrfs_list_filter_enum filter, u64 data); enum btrfs_list_filter_enum filter, u64 data);
struct btrfs_list_comparer_set *btrfs_list_alloc_comparer_set(void); struct btrfs_list_comparer_set *btrfs_list_alloc_comparer_set(void);
void btrfs_list_free_comparer_set(struct btrfs_list_comparer_set *comp_set); 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, int btrfs_list_subvols_print(int fd, struct btrfs_list_filter_set *filter_set,
struct btrfs_list_comparer_set *comp_set, struct btrfs_list_comparer_set *comp_set,

4
btrfs-map-logical.c
View File

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

4
btrfs.c
View File

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

6
btrfstune.c
View File

@ -34,7 +34,7 @@
static char *device; 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_trans_handle *trans;
struct btrfs_super_block *disk_super; struct btrfs_super_block *disk_super;
@ -65,7 +65,7 @@ int update_seeding_flag(struct btrfs_root *root, int set_flag)
return 0; 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_trans_handle *trans;
struct btrfs_super_block *disk_super; struct btrfs_super_block *disk_super;
@ -81,7 +81,7 @@ int enable_extrefs_flag(struct btrfs_root *root)
return 0; 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_trans_handle *trans;
struct btrfs_super_block *disk_super; struct btrfs_super_block *disk_super;

5
cmds-chunk.c
View File

@ -188,7 +188,8 @@ static struct btrfs_chunk *create_chunk_item(struct chunk_record *record)
return ret; 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)); memset(rc, 0, sizeof(struct recover_control));
cache_tree_init(&rc->chunk); cache_tree_init(&rc->chunk);
@ -204,7 +205,7 @@ void init_recover_control(struct recover_control *rc, int verbose, int yes)
rc->yes = 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_block_group_tree(&rc->bg);
free_chunk_cache_tree(&rc->chunk); free_chunk_cache_tree(&rc->chunk);

4
cmds-qgroup.c
View File

@ -106,7 +106,7 @@ static int qgroup_create(int create, int argc, char **argv)
return 0; 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, printf("%llu/%llu %lld %lld\n", objectid >> 48,
objectid & ((1ll << 48) - 1), objectid & ((1ll << 48) - 1),
@ -114,7 +114,7 @@ void print_qgroup_info(u64 objectid, struct btrfs_qgroup_info_item *info)
btrfs_stack_qgroup_info_exclusive(info)); btrfs_stack_qgroup_info_exclusive(info));
} }
int list_qgroups(int fd) static int list_qgroups(int fd)
{ {
int ret; int ret;
struct btrfs_ioctl_search_args args; struct btrfs_ioctl_search_args args;

2
cmds-quota.c
View File

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

4
cmds-receive.c
View File

@ -787,7 +787,7 @@ out:
} }
struct btrfs_send_ops send_ops = { static struct btrfs_send_ops send_ops = {
.subvol = process_subvol, .subvol = process_subvol,
.snapshot = process_snapshot, .snapshot = process_snapshot,
.mkfile = process_mkfile, .mkfile = process_mkfile,
@ -810,7 +810,7 @@ struct btrfs_send_ops send_ops = {
.utimes = process_utimes, .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; int ret;
char *dest_dir_full_path; char *dest_dir_full_path;

2
cmds-restore.c
View File

@ -154,7 +154,7 @@ static int decompress(char *inbuf, char *outbuf, u64 compress_len,
return -1; 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 slot;
int level = 1; int level = 1;

2
cmds-scrub.c
View File

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

2
ioctl-test.c
View File

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

2
quick-test.c
View File

@ -27,7 +27,7 @@
#include "transaction.h" #include "transaction.h"
/* for testing only */ /* 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 rand() % max_key;
// return i; // return i;
} }

2
send-test.c
View File

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

20
utils.c
View File

@ -750,7 +750,7 @@ int open_path_or_dev_mnt(const char *path, DIR **dirstream)
} }
/* checks if a device is a loop device */ /* 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; struct stat statbuf;
if(stat(device, &statbuf) < 0) if(stat(device, &statbuf) < 0)
@ -763,7 +763,8 @@ int is_loop_device (const char* device) {
/* Takes a loop device path (e.g. /dev/loop0) and returns /* Takes a loop device path (e.g. /dev/loop0) and returns
* the associated file (e.g. /images/my_btrfs.img) */ * 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; int ret;
FILE *f; FILE *f;
@ -789,7 +790,7 @@ int resolve_loop_device(const char* loop_dev, char* loop_file, int max_len)
/* Checks whether a and b are identical or device /* Checks whether a and b are identical or device
* files associated with the same block 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; struct stat st_buf_a, st_buf_b;
char real_a[PATH_MAX]; char real_a[PATH_MAX];
@ -836,7 +837,7 @@ int is_same_blk_file(const char* a, const char* b)
* if one file is a loop device that uses the other * if one file is a loop device that uses the other
* file. * 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_a[PATH_MAX];
char res_b[PATH_MAX]; char res_b[PATH_MAX];
@ -876,7 +877,7 @@ int is_same_loop_file(const char* a, const char* b)
} }
/* Checks if a file exists and is a block or regular file*/ /* 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; struct stat st_buf;
@ -893,7 +894,8 @@ int is_existing_blk_or_reg_file(const char* filename)
/* Checks if a file is used (directly or indirectly via a loop device) /* Checks if a file is used (directly or indirectly via a loop device)
* by a device in fs_devices * 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; int ret;
struct list_head *head; struct list_head *head;
@ -1539,8 +1541,8 @@ void close_file_or_dir(int fd, DIR *dirstream)
close(fd); close(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) struct btrfs_ioctl_dev_info_args *di_args)
{ {
int ret; int ret;
@ -1663,7 +1665,7 @@ static inline void translate(char *f, char *t)
* Checks if the swap device. * Checks if the swap device.
* Returns 1 if swap device, < 0 on error or 0 if not 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; FILE *f;
struct stat st_buf; struct stat st_buf;

3
utils.h
View File

@ -61,8 +61,6 @@ int btrfs_scan_block_devices(int run_ioctl);
u64 parse_size(char *s); u64 parse_size(char *s);
int open_file_or_dir(const char *fname, DIR **dirstream); int open_file_or_dir(const char *fname, DIR **dirstream);
void close_file_or_dir(int fd, DIR *dirstream); void close_file_or_dir(int fd, DIR *dirstream);
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, int get_fs_info(char *path, struct btrfs_ioctl_fs_info_args *fi_args,
struct btrfs_ioctl_dev_info_args **di_ret); struct btrfs_ioctl_dev_info_args **di_ret);
int get_label(const char *btrfs_dev); int get_label(const char *btrfs_dev);
@ -71,7 +69,6 @@ int set_label(const char *btrfs_dev, const char *label);
char *__strncpy__null(char *dest, const char *src, size_t n); char *__strncpy__null(char *dest, const char *src, size_t n);
int is_block_device(const char *file); int is_block_device(const char *file);
int open_path_or_dev_mnt(const char *path, DIR **dirstream); int open_path_or_dev_mnt(const char *path, DIR **dirstream);
int is_swap_device(const char *file);
u64 btrfs_device_size(int fd, struct stat *st); u64 btrfs_device_size(int fd, struct stat *st);
/* Helper to always get proper size of the destination string */ /* Helper to always get proper size of the destination string */
#define strncpy_null(dest, src) __strncpy__null(dest, src, sizeof(dest)) #define strncpy_null(dest, src) __strncpy__null(dest, src, sizeof(dest))