* [PATCH 2.6] clean-up: fixes "shadows local" warning
@ 2004-12-06 20:51 Riina Kikas
0 siblings, 0 replies; only message in thread
From: Riina Kikas @ 2004-12-06 20:51 UTC (permalink / raw)
To: linux-kernel; +Cc: mroos
This patch fixes warning "declaration of `err' shadows a previous local"
occuring on line 486
Signed-off-by: Riina Kikas <Riina.Kikas@mail.ee>
--- a/fs/exec.c 2004-11-30 19:43:52.000000000 +0000
+++ b/fs/exec.c 2004-12-04 12:05:58.000000000 +0000
@@ -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:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2004-12-06 20:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-12-06 20:51 [PATCH 2.6] clean-up: fixes "shadows local" warning Riina Kikas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®