The patch titled
identify_ramdisk_image(): correct typo about return value in comment
has been added to the -mm tree. Its filename is
identify_ramdisk_image-correct-typo-about-return-value-in-comment.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: identify_ramdisk_image(): correct typo about return value in comment
From: Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx>
identify_ramdisk_image() returns 0 (not -1) if a gzipped ramdisk is found:
if (buf[0] == 037 && ((buf[1] == 0213) || (buf[1] == 0236))) {
printk(KERN_NOTICE
"RAMDISK: Compressed image found at block %d\n",
start_block);
nblocks = 0;
^^^^^^^^^^^
goto done;
}
...
done:
sys_lseek(fd, start_block * BLOCK_SIZE, 0);
kfree(buf);
return nblocks;
^^^^^^^^^^^^^^
Hence correct the typo in the comment, which has existed since the
addition of compressed ramdisk support in 1.3.48.
Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
init/do_mounts_rd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN init/do_mounts_rd.c~identify_ramdisk_image-correct-typo-about-return-value-in-comment init/do_mounts_rd.c
--- a/init/do_mounts_rd.c~identify_ramdisk_image-correct-typo-about-return-value-in-comment
+++ a/init/do_mounts_rd.c
@@ -71,7 +71,7 @@ identify_ramdisk_image(int fd, int start
sys_read(fd, buf, size);
/*
- * If it matches the gzip magic numbers, return -1
+ * If it matches the gzip magic numbers, return 0
*/
if (buf[0] == 037 && ((buf[1] == 0213) || (buf[1] == 0236))) {
printk(KERN_NOTICE
_
Patches currently in -mm which might be from Geert.Uytterhoeven@xxxxxxxxxxx are
identify_ramdisk_image-correct-typo-about-return-value-in-comment.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
