From: David Sterba <dsterba@suse.com>
Date: Mon, 12 Dec 2016 17:22:10 +0000 (+0100)
Subject: btrfs-progs: defrag: cleanup temporary errno value
X-Git-Tag: upstream/4.16.1~893
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc0a80b8f2fc36ca486ae224a4bea6d3e89917bd;p=platform%2Fupstream%2Fbtrfs-progs.git

btrfs-progs: defrag: cleanup temporary errno value

Rename a single letter variable and move the defintion to the scope of
use.

Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index 64b1cc4..eb16875 100644
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -1036,7 +1036,6 @@ static int cmd_filesystem_defrag(int argc, char **argv)
 	int i;
 	int recursive = 0;
 	int ret = 0;
-	int e = 0;
 	int compress_type = BTRFS_COMPRESS_NONE;
 	DIR *dirstream;
 
@@ -1112,6 +1111,7 @@ static int cmd_filesystem_defrag(int argc, char **argv)
 
 	for (i = optind; i < argc; i++) {
 		struct stat st;
+		int defrag_err = 0;
 
 		dirstream = NULL;
 		fd = open_file_or_dir(argv[i], &dirstream);
@@ -1148,10 +1148,10 @@ static int cmd_filesystem_defrag(int argc, char **argv)
 				printf("%s\n", argv[i]);
 			ret = do_defrag(fd, defrag_global_fancy_ioctl,
 					&defrag_global_range);
-			e = errno;
+			defrag_err = errno;
 		}
 		close_file_or_dir(fd, dirstream);
-		if (ret && e == ENOTTY && defrag_global_fancy_ioctl) {
+		if (ret && defrag_err == ENOTTY && defrag_global_fancy_ioctl) {
 			error("defrag range ioctl not "
 				"supported in this kernel, please try "
 				"without any options.");
@@ -1159,7 +1159,8 @@ static int cmd_filesystem_defrag(int argc, char **argv)
 			break;
 		}
 		if (ret) {
-			error("defrag failed on %s: %s", argv[i], strerror(e));
+			error("defrag failed on %s: %s", argv[i],
+					strerror(defrag_err));
 			defrag_global_errors++;
 		}
 	}