From 25291dccbbd8e650b032b488eb4c3ccdd9f6dfea Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Fri, 5 Mar 2010 13:42:39 -0800 Subject: [PATCH] --- yaml --- r: 186236 b: refs/heads/master c: 8aaed5bec2b9177eab1796c8c4f7a4c90804eef6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/init/initramfs.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1d70e431a4c1..2942f7bfa604 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a85b8d6049cbb0e7961df2069322fbc4192026a +refs/heads/master: 8aaed5bec2b9177eab1796c8c4f7a4c90804eef6 diff --git a/trunk/init/initramfs.c b/trunk/init/initramfs.c index b37d34beb90b..37d3859b1b32 100644 --- a/trunk/init/initramfs.c +++ b/trunk/init/initramfs.c @@ -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);