patch-2.4.0-test11 linux/fs/udf/inode.c

Next file: linux/fs/udf/symlink.c
Previous file: linux/fs/udf/ialloc.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test10/linux/fs/udf/inode.c linux/fs/udf/inode.c
@@ -158,7 +158,6 @@
 {
 	struct buffer_head *bh = NULL;
 	struct page *page;
-	unsigned long kaddr = 0;
 	int block;
 
 	/* from now on we have normal address_space methods */
@@ -183,10 +182,10 @@
 		PAGE_BUG(page);
 	if (!Page_Uptodate(page))
 	{
-		kaddr = kmap(page);
-		memset((char *)kaddr + UDF_I_LENALLOC(inode), 0x00,
+		char *kaddr = kmap(page);
+		memset(kaddr + UDF_I_LENALLOC(inode), 0x00,
 			PAGE_CACHE_SIZE - UDF_I_LENALLOC(inode));
-		memcpy((char *)kaddr, bh->b_data + udf_file_entry_alloc_offset(inode),
+		memcpy(kaddr, bh->b_data + udf_file_entry_alloc_offset(inode),
 			UDF_I_LENALLOC(inode));
 		flush_dcache_page(page);
 		SetPageUptodate(page);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)