Re: patch: improve generic_file_buffered_write() (2nd try 2/2)

[Bernd Schubert <bs@q-leap.de>]

I guess when aio was introduced this was probably forgotten. For small chunks 
or synchronous i/o the likehood is correct, but for big data chunks and aio 
the likehood is false.

Signed-off-by: Bernd Schubert <bs@q-leap.de>
Signed-off-by: Goswin von Brederlow <goswin@vonbrederlow.de>

Index: linux-2.6.20.3/mm/filemap.c
===================================================================
--- linux-2.6.20.3.orig/mm/filemap.c	2007-09-05 18:51:59.000000000 +0200
+++ linux-2.6.20.3/mm/filemap.c	2007-09-05 18:53:12.000000000 +0200
@@ -2100,7 +2100,7 @@
 	/*
 	 * handle partial DIO write.  Adjust cur_iov if needed.
 	 */
-	if (likely(nr_segs == 1))
+	if (nr_segs == 1)
 		buf = iov->iov_base + written;
 	else {
 		filemap_set_next_iovec(&cur_iov, &iov_base, written);
@@ -2167,7 +2167,7 @@
 					vmtruncate(inode, isize);
 			}
 		}
-		if (likely(nr_segs == 1))
+		if (nr_segs == 1)
 			copied = filemap_copy_from_user(page, offset,
 							buf, bytes);
 		else
@@ -2213,7 +2213,7 @@
 				count -= copied;
 				pos += copied;
 				buf += copied;
-				if (unlikely(nr_segs > 1)) {
+				if (nr_segs > 1) {
 					filemap_set_next_iovec(&cur_iov,
 							&iov_base, copied);
 					if (count)