c8h4/btrfs-progs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

btrfs-progs: libbtrfs: remove declarations without exports in send-utils

Browse source 
The list of exported functions in libbtrfs.sym defines the ABI so the
headers should match that.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2022-06-03 16:56:58 +02:00
parent 0f65bf66be
commit 194b90aa2c
2 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libbtrfs/send-utils.c
View file

@ -469,6 +469,10 @@ void subvol_uuid_search_add(struct subvol_uuid_search *s,
} }
#endif #endif
static struct subvol_info *subvol_uuid_search2(struct subvol_uuid_search *s,
u64 root_id, const u8 *uuid, u64 transid,
const char *path,
enum subvol_search_type type);
struct subvol_info *subvol_uuid_search(struct subvol_uuid_search *s, struct subvol_info *subvol_uuid_search(struct subvol_uuid_search *s,
u64 root_id, const u8 *uuid, u64 transid, u64 root_id, const u8 *uuid, u64 transid,
const char *path, const char *path,
@ -553,7 +557,7 @@ out:
return ret; return ret;
} }
struct subvol_info *subvol_uuid_search2(struct subvol_uuid_search *s, static struct subvol_info *subvol_uuid_search2(struct subvol_uuid_search *s,
u64 root_id, const u8 *uuid, u64 transid, u64 root_id, const u8 *uuid, u64 transid,
const char *path, const char *path,
enum subvol_search_type type) enum subvol_search_type type)

19
libbtrfs/send-utils.h
View file

@ -79,34 +79,17 @@ struct subvol_uuid_search {
}; };
int subvol_uuid_search_init(int mnt_fd, struct subvol_uuid_search *s); int subvol_uuid_search_init(int mnt_fd, struct subvol_uuid_search *s);
void subvol_uuid_search_finit(struct subvol_uuid_search *s);
/* /*
* Search for a subvolume by given type (received uuid, root id, path), returns * Search for a subvolume by given type (received uuid, root id, path), returns
* pointer to newly allocated struct subvol_info or NULL in case it's not found * pointer to newly allocated struct subvol_info or NULL in case it's not found
* or there was another error. This ambiguity of error value is fixed by * or there was another error.
* subvol_uuid_search2 that returns a negative errno in case of an error, of a
* valid pointer otherwise.
*
* This function will be deprecated in the future, please consider using v2 in
* new code unless you need to keep backward compatibility with older
* btrfs-progs.
*/ */
struct subvol_info *subvol_uuid_search(struct subvol_uuid_search *s, struct subvol_info *subvol_uuid_search(struct subvol_uuid_search *s,
u64 root_id, const u8 *uuid, u64 transid, u64 root_id, const u8 *uuid, u64 transid,
const char *path, const char *path,
enum subvol_search_type type); enum subvol_search_type type);
struct subvol_info *subvol_uuid_search2(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); int btrfs_subvolid_resolve(int fd, char *path, size_t path_len, u64 subvol_id);
int path_cat_out(char *out, const char *p1, const char *p2);
int path_cat3_out(char *out, const char *p1, const char *p2, const char *p3);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif