Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8aaed5be authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Linus Torvalds
Browse files

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



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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9a85b8d6

init/initramfs.c

+6 −6
Original line number Diff line number Diff line
@@ -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);
@@ -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;
@@ -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);