From: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Date: Thu, 20 Feb 2014 02:49:05 +0000 (+0800)
Subject: btrfs-progs: fix wrong error msg for exec btrfsck as non-root
X-Git-Tag: upstream/4.16.1~2948
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=002d5e14304aae3c4df45b36f99cdeec51a87b4c;p=platform%2Fupstream%2Fbtrfs-progs.git

btrfs-progs: fix wrong error msg for exec btrfsck as non-root

When exec btrfsck as non-root user on a disk, btrfsck will always
warn that "No such file or directory", despite that a directory
(e.g. /dev/vboxusb)actually exists. We just have no permission.
In this case, return the -errno set by the opendir call in
btrfs_scan_one_dir rather than blindly return -ENOENT.

Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
---

diff --git a/utils.c b/utils.c
index 9a921f0..398678f 100644
--- a/utils.c
+++ b/utils.c
@@ -1111,7 +1111,7 @@ again:
 	dirp = opendir(dirname);
 	if (!dirp) {
 		fprintf(stderr, "Unable to open %s for scanning\n", dirname);
-		ret = -ENOENT;
+		ret = -errno;
 		goto fail;
 	}
 	while(1) {