From 58232f8c30086c0ef18c1b8450f853e3e83a29d5 Mon Sep 17 00:00:00 2001 From: Oleg Freedholm Date: Mon, 4 Apr 2016 01:15:58 +1000 Subject: [PATCH] store errno immediately after ioctl Signed-off-by: Oleg Freedholm --- src/lxc/bdev/lxcbtrfs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/lxc/bdev/lxcbtrfs.c b/src/lxc/bdev/lxcbtrfs.c index 6b06cfd35..5ee6dd340 100644 --- a/src/lxc/bdev/lxcbtrfs.c +++ b/src/lxc/bdev/lxcbtrfs.c @@ -568,7 +568,7 @@ static int btrfs_recursive_destroy(const char *path) struct btrfs_ioctl_search_header sh; struct btrfs_root_ref *ref; struct my_btrfs_tree *tree; - int ret, i; + int ret, e, i; unsigned long off = 0; int name_len; char *name; @@ -582,8 +582,9 @@ static int btrfs_recursive_destroy(const char *path) } if (btrfs_list_get_path_rootid(fd, &root_id)) { + e = errno; close(fd); - if (errno == EPERM || errno == EACCES) { + if (e == EPERM || e == EACCES) { WARN("Will simply try removing"); goto ignore_search; } @@ -614,10 +615,11 @@ static int btrfs_recursive_destroy(const char *path) while(1) { ret = ioctl(fd, BTRFS_IOC_TREE_SEARCH, &args); + e = errno; if (ret < 0) { close(fd); 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); goto ignore_search; } -- 2.47.2