Skip to content

Commit

Permalink
init/initramfs.c: fix "symbol shadows an earlier one" noise
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and torvalds committed Mar 6, 2010
1 parent 9a85b8d commit 8aaed5b
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions init/initramfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ static void __init clean_rootfs(void)
int fd;
void *buf;
struct linux_dirent64 *dirp;
int count;
int num;

fd = sys_open("/", O_RDONLY, 0);
WARN_ON(fd < 0);
Expand All @@ -539,9 +539,9 @@ static void __init clean_rootfs(void)
}

dirp = buf;
count = sys_getdents64(fd, dirp, BUF_SIZE);
while (count > 0) {
while (count > 0) {
num = sys_getdents64(fd, dirp, BUF_SIZE);
while (num > 0) {
while (num > 0) {
struct stat st;
int ret;

Expand All @@ -554,12 +554,12 @@ static void __init clean_rootfs(void)
sys_unlink(dirp->d_name);
}

count -= dirp->d_reclen;
num -= dirp->d_reclen;
dirp = (void *)dirp + dirp->d_reclen;
}
dirp = buf;
memset(buf, 0, BUF_SIZE);
count = sys_getdents64(fd, dirp, BUF_SIZE);
num = sys_getdents64(fd, dirp, BUF_SIZE);
}

sys_close(fd);
Expand Down

0 comments on commit 8aaed5b

Please sign in to comment.