lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

init/initramfs.c: fix "symbol shadows an earlier one" noise

Browse Source 
The symbol 'count' is a local global variable in this file.  The function
clean_rootfs() should use a different symbol name to prevent "symbol
shadows an earlier one" noise.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
H Hartley Sweeten
2010-03-05 13:42:39 -08:00
committed by Linus Torvalds
parent 9a85b8d604
commit 8aaed5bec2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
init/initramfs.c
View File

@@ -525,7 +525,7 @@ static void __init clean_rootfs(void)
int fd; int fd;
void *buf; void *buf;
struct linux_dirent64 *dirp; struct linux_dirent64 *dirp;
int count; int num;
fd = sys_open("/", O_RDONLY, 0); fd = sys_open("/", O_RDONLY, 0);
WARN_ON(fd < 0); WARN_ON(fd < 0);
@@ -539,9 +539,9 @@ static void __init clean_rootfs(void)
} }
dirp = buf; dirp = buf;
count = sys_getdents64(fd, dirp, BUF_SIZE); num = sys_getdents64(fd, dirp, BUF_SIZE);
while (count > 0) { while (num > 0) {
while (count > 0) { while (num > 0) {
struct stat st; struct stat st;
int ret; int ret;
@@ -554,12 +554,12 @@ static void __init clean_rootfs(void)
sys_unlink(dirp->d_name); sys_unlink(dirp->d_name);
} }
count -= dirp->d_reclen; num -= dirp->d_reclen;
dirp = (void *)dirp + dirp->d_reclen; dirp = (void *)dirp + dirp->d_reclen;
} }
dirp = buf; dirp = buf;
memset(buf, 0, BUF_SIZE); memset(buf, 0, BUF_SIZE);
count = sys_getdents64(fd, dirp, BUF_SIZE); num = sys_getdents64(fd, dirp, BUF_SIZE);
} }
sys_close(fd); sys_close(fd);