Commit 1000988c authored by Len Brown's avatar Len Brown

Merge intel.com:/home/lenb/bk/linux-2.6.8.1

into intel.com:/home/lenb/src/linux-acpi-test-2.6.8
parents e73cd7c9 0b9aa6dd
VERSION = 2 VERSION = 2
PATCHLEVEL = 6 PATCHLEVEL = 6
SUBLEVEL = 8 SUBLEVEL = 8
EXTRAVERSION = EXTRAVERSION = .1
NAME=Zonked Quokka NAME=Zonked Quokka
# *DOCUMENTATION* # *DOCUMENTATION*
......
...@@ -72,7 +72,7 @@ struct inode_operations nfs_file_inode_operations = { ...@@ -72,7 +72,7 @@ struct inode_operations nfs_file_inode_operations = {
static int nfs_check_flags(int flags) 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 -EINVAL;
return 0; return 0;
...@@ -89,7 +89,7 @@ nfs_file_open(struct inode *inode, struct file *filp) ...@@ -89,7 +89,7 @@ nfs_file_open(struct inode *inode, struct file *filp)
int res; int res;
res = nfs_check_flags(filp->f_flags); res = nfs_check_flags(filp->f_flags);
if (!res) if (res)
return res; return res;
lock_kernel(); lock_kernel();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment