[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.170,1.171

[Yura P. <cha...@us...>]

Changes by: cha0smaster

Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27378/libntfs

Modified Files:
	attrib.c 
Log Message:
* attrib.c: refix ntfs_attr_p{read,write}
* ntfsmount.c: code that now not really needed, but for any case


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -p -r1.170 -r1.171
--- attrib.c	1 Aug 2005 22:10:38 -0000	1.170
+++ attrib.c	3 Aug 2005 13:52:50 -0000	1.171
@@ -817,6 +817,8 @@ res_err_out:
 					errno = EIO;
 				goto rl_err_out;
 			}
+			/* Needed for case when runs merged. */
+			ofs = pos + total - (rl->vcn << vol->cluster_size_bits);
 		}
 		if (!rl->length)
 			goto rl_err_out;
@@ -1064,6 +1066,8 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
 					errno = EIO;
 				goto rl_err_out;
 			}
+			/* Needed for case when runs merged. */
+			ofs = pos + total - (rl->vcn << vol->cluster_size_bits);
 		}
 		if (!rl->length) {
 			errno = EIO;