[LV-commit] CVS: kernel-2.5/init do_mounts.c,1.6,1.7

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/init
In directory sc8-pr-cvs1:/tmp/cvs-serv20410/init

Modified Files:
	do_mounts.c 
Log Message:
Merge with 2.5.60


Index: do_mounts.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/init/do_mounts.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- do_mounts.c	21 Jul 2003 23:52:05 -0000	1.6
+++ do_mounts.c	4 Aug 2003 12:18:14 -0000	1.7
@@ -653,12 +653,6 @@
 	/*
 	 * OK, time to copy in the data
 	 */
-	buf = kmalloc(BLOCK_SIZE, GFP_KERNEL);
-	if (buf == 0) {
-		printk(KERN_ERR "RAMDISK: could not allocate buffer\n");
-		goto done;
-	}
-
 	if (sys_ioctl(in_fd, BLKGETSIZE, (unsigned long)&devblocks) < 0)
 		devblocks = 0;
 	else
@@ -669,6 +663,12 @@
 
 	if (devblocks == 0) {
 		printk(KERN_ERR "RAMDISK: could not determine device size\n");
+		goto done;
+	}
+
+	buf = kmalloc(BLOCK_SIZE, GFP_KERNEL);
+	if (buf == 0) {
+		printk(KERN_ERR "RAMDISK: could not allocate buffer\n");
 		goto done;
 	}