fixed bug connected with not moving pointer after cifs_user_read() in cifs_file_aio_read()

sources/2.6.16/cifsfs.c

@@ -629,8 +629,11 @@ static ssize_t cifs_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
 
 	if (CIFS_I(inode)->clientCanCacheRead)
 		read = generic_file_aio_read(iocb, iov, nr_segs, pos);
-	else
-		read = cifs_user_read(iocb->ki_filp, iov->iov_base, iov->iov_len, &pos);
+	else {
+		read = cifs_user_read(iocb->ki_filp, iov->iov_base,
+				      iov->iov_len, &pos);
+		iocb->ki_pos = pos;
+	}
 	return read;
 }
 

sources/2.6.23/cifsfs.c

@@ -544,8 +544,11 @@ static ssize_t cifs_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
 
 	if (CIFS_I(inode)->clientCanCacheRead)
 		read = generic_file_aio_read(iocb, iov, nr_segs, pos);
-	else
-		read = cifs_user_read(iocb->ki_filp, iov->iov_base, iov->iov_len, &pos);
+	else {
+		read = cifs_user_read(iocb->ki_filp, iov->iov_base,
+				      iov->iov_len, &pos);
+		iocb->ki_pos = pos;
+	}
 	return read;
 }
 

sources/2.6.24/cifsfs.c

@@ -543,8 +543,11 @@ static ssize_t cifs_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
 
 	if (CIFS_I(inode)->clientCanCacheRead)
 		read = generic_file_aio_read(iocb, iov, nr_segs, pos);
-	else
-		read = cifs_user_read(iocb->ki_filp, iov->iov_base, iov->iov_len, &pos);
+	else {
+		read = cifs_user_read(iocb->ki_filp, iov->iov_base,
+				      iov->iov_len, &pos);
+		iocb->ki_pos = pos;
+	}
 	return read;
 }
 

sources/2.6.25/cifsfs.c

@@ -581,8 +581,11 @@ static ssize_t cifs_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
 
 	if (CIFS_I(inode)->clientCanCacheRead)
 		read = generic_file_aio_read(iocb, iov, nr_segs, pos);
-	else
-		read = cifs_user_read(iocb->ki_filp, iov->iov_base, iov->iov_len, &pos);
+	else {
+		read = cifs_user_read(iocb->ki_filp, iov->iov_base,
+				      iov->iov_len, &pos);
+		iocb->ki_pos = pos;
+	}
 	return read;
 }
 

sources/2.6.26/cifsfs.c

@@ -608,8 +608,11 @@ static ssize_t cifs_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
 
 	if (CIFS_I(inode)->clientCanCacheRead)
 		read = generic_file_aio_read(iocb, iov, nr_segs, pos);
-	else
-		read = cifs_user_read(iocb->ki_filp, iov->iov_base, iov->iov_len, &pos);
+	else {
+		read = cifs_user_read(iocb->ki_filp, iov->iov_base,
+				      iov->iov_len, &pos);
+		iocb->ki_pos = pos;
+	}
 	return read;
 }
 

sources/2.6.27/cifsfs.c

@@ -609,8 +609,11 @@ static ssize_t cifs_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
 
 	if (CIFS_I(inode)->clientCanCacheRead)
 		read = generic_file_aio_read(iocb, iov, nr_segs, pos);
-	else
-		read = cifs_user_read(iocb->ki_filp, iov->iov_base, iov->iov_len, &pos);
+	else {
+		read = cifs_user_read(iocb->ki_filp, iov->iov_base,
+				      iov->iov_len, &pos);
+		iocb->ki_pos = pos;
+	}
 	return read;
 }
 

sources/2.6.28/cifsfs.c

@@ -613,8 +613,11 @@ static ssize_t cifs_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
 
 	if (CIFS_I(inode)->clientCanCacheRead)
 		read = generic_file_aio_read(iocb, iov, nr_segs, pos);
-	else
-		read = cifs_user_read(iocb->ki_filp, iov->iov_base, iov->iov_len, &pos);
+	else {
+		read = cifs_user_read(iocb->ki_filp, iov->iov_base,
+				      iov->iov_len, &pos);
+		iocb->ki_pos = pos;
+	}
 	return read;
 }
 

sources/2.6.29/cifsfs.c

@@ -630,8 +630,11 @@ static ssize_t cifs_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
 
 	if (CIFS_I(inode)->clientCanCacheRead)
 		read = generic_file_aio_read(iocb, iov, nr_segs, pos);
-	else
-		read = cifs_user_read(iocb->ki_filp, iov->iov_base, iov->iov_len, &pos);
+	else {
+		read = cifs_user_read(iocb->ki_filp, iov->iov_base,
+				      iov->iov_len, &pos);
+		iocb->ki_pos = pos;
+	}
 	return read;
 }
 

sources/legacy/cifsfs.c

@@ -637,8 +637,11 @@ static ssize_t cifs_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
 
 	if (CIFS_I(inode)->clientCanCacheRead)
 		read = generic_file_aio_read(iocb, iov, nr_segs, pos);
-	else
-		read = cifs_user_read(iocb->ki_filp, iov->iov_base, iov->iov_len, &pos);
+	else {
+		read = cifs_user_read(iocb->ki_filp, iov->iov_base,
+				      iov->iov_len, &pos);
+		iocb->ki_pos = pos;
+	}
 	return read;
 }