Skip to content

L
lxc
Commit 64c97ec7 by Oleg Freedholm Committed by Stéphane Graber
Options

store errno immediately after ioctl

Signed-off-by: 's avatarOleg Freedholm <overlayfs@gmail.com>
parent 553aa63d
Showing with 5 additions and 3 deletions
src/lxc/bdev.c
...@@ -1720,7 +1720,7 @@ static int btrfs_recursive_destroy(const char *path) ...@@ -1720,7 +1720,7 @@ static int btrfs_recursive_destroy(const char *path)
struct btrfs_ioctl_search_header *sh; struct btrfs_ioctl_search_header *sh;
struct btrfs_root_ref *ref; struct btrfs_root_ref *ref;
struct my_btrfs_tree *tree; struct my_btrfs_tree *tree;
int ret, i; int ret, e, i;
unsigned long off = 0; unsigned long off = 0;
int name_len; int name_len;
char *name; char *name;
...@@ -1733,8 +1733,9 @@ static int btrfs_recursive_destroy(const char *path) ...@@ -1733,8 +1733,9 @@ static int btrfs_recursive_destroy(const char *path)
} }
if (btrfs_list_get_path_rootid(fd, &root_id)) { if (btrfs_list_get_path_rootid(fd, &root_id)) {
e = errno;
close(fd); close(fd);
if (errno == EPERM || errno == EACCES) { if (e == EPERM || e == EACCES) {
WARN("Will simply try removing"); WARN("Will simply try removing");
goto ignore_search; goto ignore_search;
} }
...@@ -1765,10 +1766,11 @@ static int btrfs_recursive_destroy(const char *path) ...@@ -1765,10 +1766,11 @@ static int btrfs_recursive_destroy(const char *path)
while(1) { while(1) {
ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args); ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args);
e = errno;
if (ret < 0) { if (ret < 0) {
close(fd); close(fd);
free_btrfs_tree(tree); free_btrfs_tree(tree);
if (errno == EPERM || errno == EACCES) { if (e == EPERM || e == EACCES) {
WARN("Warn: can't perform the search under %s. Will simply try removing", path); WARN("Warn: can't perform the search under %s. Will simply try removing", path);
goto ignore_search; goto ignore_search;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment