[LV-k25-commit] kernel-2.5/fs/nfs file.c,1.1.1.25,1.2

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/fs/nfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30108/fs/nfs

Modified Files:
	file.c 
Log Message:
Merge Linus' 2.6.8.1 fix for NFS


Index: file.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/fs/nfs/file.c,v
retrieving revision 1.1.1.25
retrieving revision 1.2
diff -u -d -r1.1.1.25 -r1.2
--- file.c	2 Sep 2004 18:43:23 -0000	1.1.1.25
+++ file.c	3 Sep 2004 20:44:10 -0000	1.2
@@ -72,7 +72,7 @@
 
 static int nfs_check_flags(int flags)
 {
-	if (flags & (O_APPEND | O_DIRECT))
+	if ((flags & (O_APPEND | O_DIRECT)) == (O_APPEND | O_DIRECT))
 		return -EINVAL;
 
 	return 0;
@@ -89,7 +89,7 @@
 	int res;
 
 	res = nfs_check_flags(filp->f_flags);
-	if (!res)
+	if (res)
 		return res;
 
 	lock_kernel();