diff options
author | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-05-10 10:13:23 +0100 |
---|---|---|
committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-05-10 10:13:23 +0100 |
commit | 58e631d01823afd60e52f3a09887f270a91889a0 (patch) | |
tree | 6afbca5492c1ad1040608e01fe0c9d909482adeb /utils.h | |
parent | cec572daccafa1e912cbed363df6f84687778c6f (diff) |
New upstream release 4.5.2.
* Thanks for NMU of package rename.
* New upstream release 4.5.2.
* Upload using dgit.
* Source-only upload.
* btrfs-convert should not be included in the initramfs, but should be
compiled. Using btrfs-convert is not a trivial operation, and
especially not from a minimal shell. Also it is known to fail, and for
a sophisticated user it is trivial to include it in the
initramfs. Thus won't fix Closes: #801192
* No sponsorship required Closes: #823474
* Add Provides btrfs-tools-udeb to the -progs-udeb package.
Diffstat (limited to 'utils.h')
-rw-r--r-- | utils.h | 42 |
1 files changed, 22 insertions, 20 deletions
@@ -23,6 +23,8 @@ #include "ctree.h" #include <dirent.h> #include <stdarg.h> +#include "internal.h" +#include "btrfs-list.h" #define BTRFS_MKFS_SYSTEM_GROUP_SIZE (4 * 1024 * 1024) #define BTRFS_MKFS_SMALL_VOLUME_SIZE (1024 * 1024 * 1024) @@ -124,8 +126,8 @@ struct btrfs_mkfs_config { int make_btrfs(int fd, struct btrfs_mkfs_config *cfg); int btrfs_make_root_dir(struct btrfs_trans_handle *trans, struct btrfs_root *root, u64 objectid); -int btrfs_prepare_device(int fd, char *file, int zero_end, u64 *block_count_ret, - u64 max_block_count, int discard); +int btrfs_prepare_device(int fd, const char *file, int zero_end, + u64 *block_count_ret, u64 max_block_count, int discard); int btrfs_add_to_fsid(struct btrfs_trans_handle *trans, struct btrfs_root *root, int fd, char *path, u64 block_count, u32 io_width, u32 io_align, @@ -158,7 +160,7 @@ int get_fs_info(char *path, struct btrfs_ioctl_fs_info_args *fi_args, int get_label(const char *btrfs_dev, char *label); 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_mount_point(const char *file); int check_arg_type(const char *input); @@ -166,17 +168,17 @@ int open_path_or_dev_mnt(const char *path, DIR **dirstream, int verbose); int btrfs_open_dir(const char *path, DIR **dirstream, int verbose); 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)) -int test_dev_for_mkfs(char *file, int force_overwrite); +#define strncpy_null(dest, src) __strncpy_null(dest, src, sizeof(dest)) +int test_dev_for_mkfs(const char *file, int force_overwrite); int get_label_mounted(const char *mount_path, char *labelp); int get_label_unmounted(const char *dev, char *label); int test_num_disk_vs_raid(u64 metadata_profile, u64 data_profile, u64 dev_cnt, int mixed, int ssd); int group_profile_max_safe_loss(u64 flags); -int is_vol_small(char *file); +int is_vol_small(const char *file); int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf, int verify); -int ask_user(char *question); +int ask_user(const char *question); int lookup_ino_rootid(int fd, u64 *rootid); int btrfs_scan_lblkid(void); int get_btrfs_mount(const char *dev, char *mp, size_t mp_size); @@ -184,17 +186,17 @@ int find_mount_root(const char *path, char **mount_root); int get_device_info(int fd, u64 devid, struct btrfs_ioctl_dev_info_args *di_args); int test_uuid_unique(char *fs_uuid); -u64 disk_size(char *path); -int get_device_info(int fd, u64 devid, - struct btrfs_ioctl_dev_info_args *di_args); -u64 get_partition_size(char *dev); -const char* group_type_str(u64 flags); -const char* group_profile_str(u64 flags); +u64 disk_size(const char *path); +u64 get_partition_size(const char *dev); -int test_minimum_size(const char *file, u32 leafsize); +int test_minimum_size(const char *file, u32 nodesize); int test_issubvolname(const char *name); +int test_issubvolume(const char *path); int test_isdir(const char *path); +const char *subvol_strip_mountpoint(const char *mnt, const char *full_path); +int get_subvol_info(const char *fullpath, struct root_info *get_ri); + /* * Btrfs minimum size calculation is complicated, it should include at least: * 1. system group size @@ -205,19 +207,19 @@ int test_isdir(const char *path); * To avoid the overkill calculation, (system group + global block rsv) * 2 * for *EACH* device should be good enough. */ -static inline u64 btrfs_min_global_blk_rsv_size(u32 leafsize) +static inline u64 btrfs_min_global_blk_rsv_size(u32 nodesize) { - return leafsize << 10; + return nodesize << 10; } -static inline u64 btrfs_min_dev_size(u32 leafsize) +static inline u64 btrfs_min_dev_size(u32 nodesize) { return 2 * (BTRFS_MKFS_SYSTEM_GROUP_SIZE + - btrfs_min_global_blk_rsv_size(leafsize)); + btrfs_min_global_blk_rsv_size(nodesize)); } int find_next_key(struct btrfs_path *path, struct btrfs_key *key); -char* btrfs_group_type_str(u64 flag); -char* btrfs_group_profile_str(u64 flag); +const char* btrfs_group_type_str(u64 flag); +const char* btrfs_group_profile_str(u64 flag); /* * Get the length of the string converted from a u64 number. |