projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/i915: make hw page ioremap use ioremap_wc
[linux-2.6-block.git]
/
fs
/
nfsctl.c
diff --git
a/fs/nfsctl.c
b/fs/nfsctl.c
index b1acbd6ab6fb07c857b910f518a53736d8bd3631..8f9a20556f798931ee906c4e3a08660e55778f60 100644
(file)
--- a/
fs/nfsctl.c
+++ b/
fs/nfsctl.c
@@
-38,9
+38,10
@@
static struct file *do_open(char *name, int flags)
return ERR_PTR(error);
if (flags == O_RDWR)
return ERR_PTR(error);
if (flags == O_RDWR)
- error = may_open(&nd,MAY_READ|MAY_WRITE,FMODE_READ|FMODE_WRITE);
+ error = may_open(&nd.path, MAY_READ|MAY_WRITE,
+ FMODE_READ|FMODE_WRITE);
else
else
- error = may_open(&nd, MAY_WRITE, FMODE_WRITE);
+ error = may_open(&nd
.path
, MAY_WRITE, FMODE_WRITE);
if (!error)
return dentry_open(nd.path.dentry, nd.path.mnt, flags,
if (!error)
return dentry_open(nd.path.dentry, nd.path.mnt, flags,
@@
-85,8
+86,8
@@
static struct {
},
};
},
};
-long
-
asmlinkage sys_nfsservctl(int cmd, struct nfsctl_arg __user *arg, void __user *
res)
+SYSCALL_DEFINE3(nfsservctl, int, cmd, struct nfsctl_arg __user *, arg,
+
void __user *,
res)
{
struct file *file;
void __user *p = &arg->u;
{
struct file *file;
void __user *p = &arg->u;