patch-1.3.86 linux/fs/read_write.c

Next file: linux/fs/super.c
Previous file: linux/fs/open.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.85/linux/fs/read_write.c linux/fs/read_write.c
@@ -114,7 +114,7 @@
 		return -EINVAL;
 	if (!count)
 		return 0;
-	error = locks_verify(FLOCK_VERIFY_READ,inode,file,file->f_pos,count);
+	error = locks_verify_area(FLOCK_VERIFY_READ,inode,file,file->f_pos,count);
 	if (error)
 		return error;
 	error = verify_area(VERIFY_WRITE,buf,count);
@@ -138,7 +138,7 @@
 		return -EINVAL;
 	if (!count)
 		return 0;
-	error = locks_verify(FLOCK_VERIFY_WRITE,inode,file,file->f_pos,count);
+	error = locks_verify_area(FLOCK_VERIFY_WRITE,inode,file,file->f_pos,count);
 	if (error)
 		return error;
 	error = verify_area(VERIFY_READ,buf,count);
@@ -227,8 +227,8 @@
 			return retval;
 	}
 
-	retval = locks_verify(type == VERIFY_READ ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE,
-			      inode, file, file->f_pos, tot_len);
+	retval = locks_verify_area(type == VERIFY_READ ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE,
+				   inode, file, file->f_pos, tot_len);
 	if (retval)
 		return retval;
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this