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

btrfs-progs: move find_mount_root to utils.[ch] 

Move find_mount_root to utils.[ch] for general use.

Signed-off-by: Qu Wenruo <quwenruo@cn.fuijitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
master
Qu Wenruo 2014-02-10 15:28:28 +08:00 committed by Chris Mason
parent e7839bced7
commit 14ef4f5695
4 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
cmds-send.c
View File

@ -39,6 +39,7 @@
#include "ioctl.h"
#include "commands.h"
#include "list.h"
#include "utils.h"
#include "send.h"
#include "send-utils.h"
@ -57,54 +58,6 @@ struct btrfs_send {
struct subvol_uuid_search sus;
};
int find_mount_root(const char *path, char **mount_root)
{
FILE *mnttab;
int fd;
struct mntent *ent;
int len;
int ret;
int longest_matchlen = 0;
char *longest_match = NULL;
fd = open(path, O_RDONLY | O_NOATIME);
if (fd < 0)
return -errno;
close(fd);
mnttab = setmntent("/proc/self/mounts", "r");
if (!mnttab)
return -errno;
while ((ent = getmntent(mnttab))) {
len = strlen(ent->mnt_dir);
if (strncmp(ent->mnt_dir, path, len) == 0) {
/* match found */
if (longest_matchlen < len) {
free(longest_match);
longest_matchlen = len;
longest_match = strdup(ent->mnt_dir);
}
}
}
endmntent(mnttab);
if (!longest_match) {
fprintf(stderr,
"ERROR: Failed to find mount root for path %s.\n",
path);
return -ENOENT;
}
ret = 0;
*mount_root = realpath(longest_match, NULL);
if (!*mount_root)
ret = -errno;
free(longest_match);
return ret;
}
static int get_root_id(struct btrfs_send *s, const char *path, u64 *root_id)
{
struct subvol_info *si;

1
commands.h
View File

@ -126,5 +126,4 @@ int cmd_rescue(int argc, char **argv);
int test_issubvolume(char *path);
/* send.c */
int find_mount_root(const char *path, char **mount_root);
char *get_subvol_name(char *mnt, char *full_path);

48
utils.c
View File

@ -2110,3 +2110,51 @@ int lookup_ino_rootid(int fd, u64 *rootid)
return 0;
}
int find_mount_root(const char *path, char **mount_root)
{
FILE *mnttab;
int fd;
struct mntent *ent;
int len;
int ret;
int longest_matchlen = 0;
char *longest_match = NULL;
fd = open(path, O_RDONLY | O_NOATIME);
if (fd < 0)
return -errno;
close(fd);
mnttab = setmntent("/proc/self/mounts", "r");
if (!mnttab)
return -errno;
while ((ent = getmntent(mnttab))) {
len = strlen(ent->mnt_dir);
if (strncmp(ent->mnt_dir, path, len) == 0) {
/* match found */
if (longest_matchlen < len) {
free(longest_match);
longest_matchlen = len;
longest_match = strdup(ent->mnt_dir);
}
}
}
endmntent(mnttab);
if (!longest_match) {
fprintf(stderr,
"ERROR: Failed to find mount root for path %s.\n",
path);
return -ENOENT;
}
ret = 0;
*mount_root = realpath(longest_match, NULL);
if (!*mount_root)
ret = -errno;
free(longest_match);
return ret;
}

1
utils.h
View File

@ -96,5 +96,6 @@ int ask_user(char *question);
int lookup_ino_rootid(int fd, u64 *rootid);
int btrfs_scan_lblkid(int update_kernel);
int get_btrfs_mount(const char *dev, char *mp, size_t mp_size);
int find_mount_root(const char *path, char **mount_root);
#endif