proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-14 12:56:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #581 from Blub/master

Browse Source 
Use /dev/loop-control if it exists
This commit is contained in:
Stéphane Graber 2015-07-19 22:21:21 -04:00
commit b9efb0c91c
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lxc/bdev.c
View File

@ -1868,7 +1868,7 @@ static int loop_detect(const char *path)
return 0; return 0;
} }
static int find_free_loopdev(int *retfd, char *namep) static int find_free_loopdev_no_control(int *retfd, char *namep)
{ {
struct dirent dirent, *direntp; struct dirent dirent, *direntp;
struct loop_info64 lo; struct loop_info64 lo;
@ -1908,6 +1908,26 @@ static int find_free_loopdev(int *retfd, char *namep)
return 0; return 0;
} }
static int find_free_loopdev(int *retfd, char *namep)
{
int rc, fd = -1;
int ctl = open("/dev/loop-control", O_RDWR);
if (ctl < 0)
return find_free_loopdev_no_control(retfd, namep);
rc = ioctl(ctl, LOOP_CTL_GET_FREE);
if (rc >= 0) {
snprintf(namep, 100, "/dev/loop%d", rc);
fd = open(namep, O_RDWR);
}
close(ctl);
if (fd == -1) {
ERROR("No loop device found");
return -1;
}
*retfd = fd;
return 0;
}
static int loop_mount(struct bdev *bdev) static int loop_mount(struct bdev *bdev)
{ {
int lfd, ffd = -1, ret = -1; int lfd, ffd = -1, ret = -1;