projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] slab: remove SLAB_NOFS
[powerpc.git]
/
fs
/
nfs
/
proc.c
diff --git
a/fs/nfs/proc.c
b/fs/nfs/proc.c
index
0b507bf
..
4529cc4
100644
(file)
--- a/
fs/nfs/proc.c
+++ b/
fs/nfs/proc.c
@@
-352,7
+352,7
@@
nfs_proc_unlink_setup(struct rpc_message *msg, struct dentry *dir, struct qstr *
{
struct nfs_diropargs *arg;
{
struct nfs_diropargs *arg;
- arg =
(struct nfs_diropargs *)
kmalloc(sizeof(*arg), GFP_KERNEL);
+ arg = kmalloc(sizeof(*arg), GFP_KERNEL);
if (!arg)
return -ENOMEM;
arg->fh = NFS_FH(dir->d_inode);
if (!arg)
return -ENOMEM;
arg->fh = NFS_FH(dir->d_inode);
@@
-425,8
+425,8
@@
nfs_proc_link(struct inode *inode, struct inode *dir, struct qstr *name)
}
static int
}
static int
-nfs_proc_symlink(struct inode *dir, struct dentry *dentry, struct
qstr *path
,
- struct iattr *sattr)
+nfs_proc_symlink(struct inode *dir, struct dentry *dentry, struct
page *page
,
+
unsigned int len,
struct iattr *sattr)
{
struct nfs_fh fhandle;
struct nfs_fattr fattr;
{
struct nfs_fh fhandle;
struct nfs_fattr fattr;
@@
-434,8
+434,8
@@
nfs_proc_symlink(struct inode *dir, struct dentry *dentry, struct qstr *path,
.fromfh = NFS_FH(dir),
.fromname = dentry->d_name.name,
.fromlen = dentry->d_name.len,
.fromfh = NFS_FH(dir),
.fromname = dentry->d_name.name,
.fromlen = dentry->d_name.len,
- .
topath = path->nam
e,
- .
tolen = path->
len,
+ .
pages = &pag
e,
+ .
pathlen =
len,
.sattr = sattr
};
struct rpc_message msg = {
.sattr = sattr
};
struct rpc_message msg = {
@@
-444,11
+444,11
@@
nfs_proc_symlink(struct inode *dir, struct dentry *dentry, struct qstr *path,
};
int status;
};
int status;
- if (
path->
len > NFS2_MAXPATHLEN)
+ if (len > NFS2_MAXPATHLEN)
return -ENAMETOOLONG;
return -ENAMETOOLONG;
- dprintk("NFS call symlink %s
-> %s\n", dentry->d_name.name,
- path->name);
+ dprintk("NFS call symlink %s
\n", dentry->d_name.name);
+
status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
nfs_mark_for_revalidate(dir);
status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
nfs_mark_for_revalidate(dir);