RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-08 18:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: Check fstype in find_mount_root()

Browse Source 
When calling find_mount_root(), caller in fact wants to find the mount
point of *BTRFS*.

So also check ent->fstype in find_mount_root() and do special error
string output in caller.

This will suppress a lot of "Inapproiate ioctl for device" error
message.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
Qu Wenruo 2014-07-23 13:47:35 +08:00 committed by David Sterba
parent 10c8f34f51
commit de22c28ef3
4 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmds-receive.c
View File

@ -848,6 +848,13 @@ static int do_receive(struct btrfs_receive *r, const char *tomnt, int r_fd,
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
if (ret > 0) {
fprintf(stderr,
"ERROR: %s doesn't belong to btrfs mount point\n",
dest_dir_full_path);
ret = -EINVAL;
goto out;
}
r->mnt_fd = open(r->root_path, O_RDONLY | O_NOATIME); r->mnt_fd = open(r->root_path, O_RDONLY | O_NOATIME);
if (r->mnt_fd < 0) { if (r->mnt_fd < 0) {
ret = -errno; ret = -errno;

14
cmds-send.c
View File

@ -355,6 +355,13 @@ static int init_root_path(struct btrfs_send *s, const char *subvol)
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
if (ret > 0) {
fprintf(stderr,
"ERROR: %s doesn't belong to btrfs mount point\n",
subvol);
ret = -EINVAL;
goto out;
}
s->mnt_fd = open(s->root_path, O_RDONLY | O_NOATIME); s->mnt_fd = open(s->root_path, O_RDONLY | O_NOATIME);
if (s->mnt_fd < 0) { if (s->mnt_fd < 0) {
@ -587,6 +594,13 @@ int cmd_send(int argc, char **argv)
strerror(-ret)); strerror(-ret));
goto out; goto out;
} }
if (ret > 0) {
fprintf(stderr,
"ERROR: %s doesn't belong to btrfs mount point\n",
subvol);
ret = -EINVAL;
goto out;
}
if (strcmp(send.root_path, mount_root) != 0) { if (strcmp(send.root_path, mount_root) != 0) {
ret = -EINVAL; ret = -EINVAL;
fprintf(stderr, "ERROR: all subvols must be from the " fprintf(stderr, "ERROR: all subvols must be from the "

7
cmds-subvolume.c
View File

@ -933,6 +933,13 @@ static int cmd_subvol_show(int argc, char **argv)
"%s\n", fullpath, strerror(-ret)); "%s\n", fullpath, strerror(-ret));
goto out; goto out;
} }
if (ret > 0) {
fprintf(stderr,
"ERROR: %s doesn't belong to btrfs mount point\n",
fullpath);
ret = -EINVAL;
goto out;
}
ret = 1; ret = 1;
svpath = get_subvol_name(mnt, fullpath); svpath = get_subvol_name(mnt, fullpath);

11
utils.c
View File

@ -2324,6 +2324,11 @@ int lookup_ino_rootid(int fd, u64 *rootid)
return 0; return 0;
} }
/*
* return 0 if a btrfs mount point is found
* return 1 if a mount point is found but not btrfs
* return <0 if something goes wrong
*/
int find_mount_root(const char *path, char **mount_root) int find_mount_root(const char *path, char **mount_root)
{ {
FILE *mnttab; FILE *mnttab;
@ -2331,6 +2336,7 @@ int find_mount_root(const char *path, char **mount_root)
struct mntent *ent; struct mntent *ent;
int len; int len;
int ret; int ret;
int not_btrfs = 1;
int longest_matchlen = 0; int longest_matchlen = 0;
char *longest_match = NULL; char *longest_match = NULL;
@ -2351,6 +2357,7 @@ int find_mount_root(const char *path, char **mount_root)
free(longest_match); free(longest_match);
longest_matchlen = len; longest_matchlen = len;
longest_match = strdup(ent->mnt_dir); longest_match = strdup(ent->mnt_dir);
not_btrfs = strcmp(ent->mnt_type, "btrfs");
} }
} }
} }
@ -2358,6 +2365,10 @@ int find_mount_root(const char *path, char **mount_root)
if (!longest_match) if (!longest_match)
return -ENOENT; return -ENOENT;
if (not_btrfs) {
free(longest_match);
return 1;
}
ret = 0; ret = 0;
*mount_root = realpath(longest_match, NULL); *mount_root = realpath(longest_match, NULL);