X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=fs%2Fnfsctl.c;h=bf9cbd242dddbe5f7cda1969fc3eeebbd6e023ad;hb=b7bb0a12913a582dbb0954bf463b1152b540c1a6;hp=8f9a20556f798931ee906c4e3a08660e55778f60;hpb=1e7bfb2134dfec37ce04fb3a4ca89299e892d10c;p=safe%2Fjmp%2Flinux-2.6

diff --git a/fs/nfsctl.c b/fs/nfsctl.c
index 8f9a205..bf9cbd2 100644
--- a/fs/nfsctl.c
+++ b/fs/nfsctl.c
@@ -7,8 +7,6 @@
 #include <linux/types.h>
 #include <linux/file.h>
 #include <linux/fs.h>
-#include <linux/sunrpc/svc.h>
-#include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/syscall.h>
 #include <linux/cred.h>
 #include <linux/sched.h>
@@ -38,10 +36,9 @@ static struct file *do_open(char *name, int flags)
 		return ERR_PTR(error);
 
 	if (flags == O_RDWR)
-		error = may_open(&nd.path, MAY_READ|MAY_WRITE,
-					   FMODE_READ|FMODE_WRITE);
+		error = may_open(&nd.path, MAY_READ|MAY_WRITE, flags);
 	else
-		error = may_open(&nd.path, MAY_WRITE, FMODE_WRITE);
+		error = may_open(&nd.path, MAY_WRITE, flags);
 
 	if (!error)
 		return dentry_open(nd.path.dentry, nd.path.mnt, flags,