lxc: update to version 1.1.5

This commit is contained in:
Mak Krnic
2016-02-10 11:39:59 +01:00
parent a91a6f5b5a
commit fdacf2cd20
3 changed files with 14 additions and 6 deletions
+10 -2
View File
@@ -1,12 +1,20 @@
--- a/src/lxc/bdev.c
+++ b/src/lxc/bdev.c
@@ -1936,3 +1936,3 @@ static int loop_mount(struct bdev *bdev)
@@ -1939,7 +1939,7 @@ static int find_free_loopdev(int *retfd,
static int loop_mount(struct bdev *bdev)
{
- int lfd, ffd = -1, ret = -1;
+ int lfd = -1, ffd = -1, ret = -1;
struct loop_info64 lo;
@@ -1974,3 +1974,3 @@ out:
char loname[100];
@@ -1977,7 +1977,7 @@ out:
if (ffd > -1)
close(ffd);
if (ret < 0) {
- close(lfd);
+ if (lfd > -1) close(lfd);
bdev->lofd = -1;
}
return ret;