Skip to contentSkip to conversation

clean-up: fixes "shadows local" warning

PATCH New Riina Kikas 1 participant 1 message Dec 6, 2004

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clean-up: fixes "shadows local" warning

This patch fixes warning "declaration of `err' shadows a previous local" occuring on line 486

fs/exec.c +8 -8
@@ -483,17 +483,17 @@
 		file = ERR_PTR(-EACCES);
 		if (!(nd.mnt->mnt_flags & MNT_NOEXEC) &&
 		    S_ISREG(inode->i_mode)) {
-			int err = permission(inode, MAY_EXEC, &nd);
-			if (!err && !(inode->i_mode & 0111))
-				err = -EACCES;
-			file = ERR_PTR(err);
-			if (!err) {
+			int perm_err = permission(inode, MAY_EXEC, &nd);
+			if (!perm_err && !(inode->i_mode & 0111))
+				perm_err = -EACCES;
+			file = ERR_PTR(perm_err);
+			if (!perm_err) {
 				file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
 				if (!IS_ERR(file)) {
-					err = deny_write_access(file);
-					if (err) {
+					perm_err = deny_write_access(file);
+					if (perm_err) {
 						fput(file);
-						file = ERR_PTR(err);
+						file = ERR_PTR(perm_err);
 					}
 				}
 out: