patch-2.1.90 linux/fs/hfs/file_cap.c

Next file: linux/fs/hfs/file_hdr.c
Previous file: linux/fs/hfs/file.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.89/linux/fs/hfs/file_cap.c linux/fs/hfs/file_cap.c
@@ -164,8 +164,7 @@
 			memcount = left;
 		}
 		cap_build_meta(&meta, entry);
-		/* is copy_to_user guaranteed to write memcount? */
-		copy_to_user(buf, ((char *)&meta) + pos, memcount);
+		memcount -= copy_to_user(buf, ((char *)&meta) + pos, memcount);
 		left -= memcount;
 		read += memcount;
 		pos += memcount;
@@ -291,6 +290,8 @@
  */
 static void cap_info_truncate(struct inode *inode)
 {
+  	/*struct inode *inode = dentry->d_inode;*/
+
 	if (inode->i_size > HFS_FORK_MAX) {
 		inode->i_size = HFS_FORK_MAX;
 	}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov