patch-2.4.0-test11 linux/drivers/block/loop.c

• Lines: 20
• Date: Fri Nov 17 11:36:27 2000
• Orig file: v2.4.0-test10/linux/drivers/block/loop.c
• Orig date: Tue Oct 31 12:42:26 2000

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/block/loop.c linux/drivers/block/loop.c
@@ -235,7 +235,7 @@
 	if (size > count)
 		size = count;
 
-	kaddr = (char*)kmap(page);
+	kaddr = kmap(page);
 	if ((lo->transfer)(lo,READ,kaddr+offset,p->data,size,IV)) {
 		size = 0;
 		printk(KERN_ERR "loop: transfer error block %ld\n",
@@ -411,10 +411,6 @@
 
 	error = -EINVAL;
 	inode = file->f_dentry->d_inode;
-	if (!inode) {
-		printk(KERN_ERR "loop_set_fd: NULL inode?!?\n");
-		goto out_putf;
-	}
 
 	if (S_ISBLK(inode->i_mode)) {
 		/* dentry will be wired, so... */