Re: O_DIRECT

["Stephen C. Tweedie" <sct@redhat.com>]

Hi Alan,

On Fri, 2003-06-27 at 10:40, Stephen C. Tweedie wrote:

> On Thu, 2003-06-26 at 21:21, Alan Cox wrote:
> > So its now confirmed with 3 distros, two file systems and several 
> > compilers. It certainly seems to be the O_DIRECT patches but I'll pull
> > the back out for the next -ac and check I guess

Ouch ouch ouch, there's nasty merge conflict between the O_DIRECT patch
and an existing 64-bit rlimit chunk in -ac3.  You really, really want
the change below. :-)  Marcelo's tree appears OK, and this is a common
code path for all filesystems in -ac, so it matches the failure patterns
that far.

Cheers,
 Stephen

--- mm/filemap.c.~1~	2003-06-27 09:58:08.000000000 +0100
+++ mm/filemap.c	2003-06-27 11:13:07.000000000 +0100
@@ -2995,8 +2995,8 @@
 		}
 		/* Fix this up when we got to rlimit64 */
 		if (pos > 0xFFFFFFFFULL)
-			count = 0;
-		else if(count > limit - (u32)pos) {
+			*count = 0;
+		else if(*count > limit - (u32)pos) {
 			/* send_sig(SIGXFSZ, current, 0); */
 			*count = limit - (u32)pos;
 		}