# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/11/23 14:07:34+03:00 vs@tribesman.namesys.com 
#   read_unix_file: missing calls to txn_restart() are added
# 
# plugin/file/file.c
#   2004/11/23 14:07:31+03:00 vs@tribesman.namesys.com +4 -1
#   read_unix_file: missing calls to txn_restart() are added
# 
diff -Nru a/plugin/file/file.c b/plugin/file/file.c
--- a/plugin/file/file.c	2004-11-23 14:45:34 +03:00
+++ b/plugin/file/file.c	2004-11-23 14:45:34 +03:00
@@ -1741,6 +1741,8 @@
 	while (left > 0) {
 		size_t to_read;		
 
+		txn_restart_current();
+
 		size = i_size_read(inode);
 		if (*off >= size)
 			/* position to read from is past the end of file */
@@ -1774,7 +1776,6 @@
 		if (user_space)
 			reiser4_put_user_pages(pages, nr_pages);
 		drop_nonexclusive_access(uf_info);
-		txn_restart_current();
 
 		if (read < 0) {
 			result = read;
@@ -1974,6 +1975,8 @@
 
 	drop_nonexclusive_access(unix_file_inode_data(inode));
 	up_read(&reiser4_inode_data(inode)->coc_sem);
+
+	txn_restart_current();
 
 	reiser4_exit_context(&ctx);
 	return page;