From: Andreas Gruenbacher <agruen@suse.de>
Trond Myklebust <trond.myklebust@fys.uio.no> wrote:
[...] How about if we change the interfaces for NFS_PROTO()->mknod(), and
mkdir, so that they take a dentry argument instead of the struct qstr, and
then have them instantiate the dentry? The appended (untested) patch tries to
do this for mknod()...
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/fs/nfs/dir.c | 13 ++++---------
25-akpm/fs/nfs/nfs3proc.c | 22 ++++++++++++----------
25-akpm/fs/nfs/nfs4proc.c | 29 +++++++++++++++--------------
25-akpm/fs/nfs/proc.c | 19 +++++++++++--------
25-akpm/include/linux/nfs_xdr.h | 3 +--
5 files changed, 43 insertions(+), 43 deletions(-)
diff -puN fs/nfs/dir.c~nfsacl-nfs-mkdir-cleanup fs/nfs/dir.c
--- 25/fs/nfs/dir.c~nfsacl-nfs-mkdir-cleanup 2005-02-28 16:17:56.000000000 -0800
+++ 25-akpm/fs/nfs/dir.c 2005-02-28 16:17:56.000000000 -0800
@@ -1046,9 +1046,7 @@ nfs_mknod(struct inode *dir, struct dent
static int nfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
{
struct iattr attr;
- struct nfs_fattr fattr;
- struct nfs_fh fhandle;
- int error;
+ int status;
dfprintk(VFS, "NFS: mkdir(%s/%ld, %s\n", dir->i_sb->s_id,
dir->i_ino, dentry->d_name.name);
@@ -1067,15 +1065,12 @@ static int nfs_mkdir(struct inode *dir,
d_drop(dentry);
#endif
nfs_begin_data_update(dir);
- error = NFS_PROTO(dir)->mkdir(dir, &dentry->d_name, &attr, &fhandle,
- &fattr);
+ status = NFS_PROTO(dir)->mkdir(dir, dentry, &attr);
nfs_end_data_update(dir);
- if (!error)
- error = nfs_instantiate(dentry, &fhandle, &fattr);
- else
+ if (status)
d_drop(dentry);
unlock_kernel();
- return error;
+ return status;
}
static int nfs_rmdir(struct inode *dir, struct dentry *dentry)
diff -puN fs/nfs/nfs3proc.c~nfsacl-nfs-mkdir-cleanup fs/nfs/nfs3proc.c
--- 25/fs/nfs/nfs3proc.c~nfsacl-nfs-mkdir-cleanup 2005-02-28 16:17:56.000000000 -0800
+++ 25-akpm/fs/nfs/nfs3proc.c 2005-02-28 16:17:56.000000000 -0800
@@ -540,28 +540,30 @@ nfs3_proc_symlink(struct inode *dir, str
}
static int
-nfs3_proc_mkdir(struct inode *dir, struct qstr *name, struct iattr *sattr,
- struct nfs_fh *fhandle, struct nfs_fattr *fattr)
+nfs3_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)
{
- struct nfs_fattr dir_attr;
+ struct nfs_fattr fattr, dir_attr;
+ struct nfs_fh fh;
struct nfs3_mkdirargs arg = {
.fh = NFS_FH(dir),
- .name = name->name,
- .len = name->len,
+ .name = dentry->d_name.name,
+ .len = dentry->d_name.len,
.sattr = sattr
};
struct nfs3_diropres res = {
.dir_attr = &dir_attr,
- .fh = fhandle,
- .fattr = fattr
+ .fh = &fh,
+ .fattr = &fattr
};
- int status;
+ int status;
- dprintk("NFS call mkdir %s\n", name->name);
+ dprintk("NFS call mkdir %s\n", dentry->d_name.name);
dir_attr.valid = 0;
- fattr->valid = 0;
+ fattr.valid = 0;
status = rpc_call(NFS_CLIENT(dir), NFS3PROC_MKDIR, &arg, &res, 0);
nfs_refresh_inode(dir, &dir_attr);
+ if (!status)
+ status = nfs_instantiate(dentry, &fh, &fattr);
dprintk("NFS reply mkdir: %d\n", status);
return status;
}
diff -puN fs/nfs/nfs4proc.c~nfsacl-nfs-mkdir-cleanup fs/nfs/nfs4proc.c
--- 25/fs/nfs/nfs4proc.c~nfsacl-nfs-mkdir-cleanup 2005-02-28 16:17:56.000000000 -0800
+++ 25-akpm/fs/nfs/nfs4proc.c 2005-02-28 16:17:56.000000000 -0800
@@ -1539,49 +1539,50 @@ static int nfs4_proc_symlink(struct inod
return err;
}
-static int _nfs4_proc_mkdir(struct inode *dir, struct qstr *name,
- struct iattr *sattr, struct nfs_fh *fhandle,
- struct nfs_fattr *fattr)
+static int _nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,
+ struct iattr *sattr)
{
struct nfs_server *server = NFS_SERVER(dir);
+ struct nfs_fh fh;
+ struct nfs_fattr fattr;
struct nfs4_create_arg arg = {
.dir_fh = NFS_FH(dir),
.server = server,
- .name = name,
+ .name = &dentry->d_name,
.attrs = sattr,
.ftype = NF4DIR,
.bitmask = server->attr_bitmask,
};
struct nfs4_create_res res = {
.server = server,
- .fh = fhandle,
- .fattr = fattr,
+ .fh = &fh,
+ .fattr = &fattr,
};
struct rpc_message msg = {
.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_CREATE],
.rpc_argp = &arg,
.rpc_resp = &res,
};
- int status;
+ int status;
- fattr->valid = 0;
+ fattr.valid = 0;
status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
- if (!status)
+ if (!status) {
update_changeattr(dir, &res.dir_cinfo);
+ status = nfs_instantiate(dentry, &fh, &fattr);
+ }
return status;
}
-static int nfs4_proc_mkdir(struct inode *dir, struct qstr *name,
- struct iattr *sattr, struct nfs_fh *fhandle,
- struct nfs_fattr *fattr)
+static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,
+ struct iattr *sattr)
{
struct nfs4_exception exception = { };
int err;
do {
err = nfs4_handle_exception(NFS_SERVER(dir),
- _nfs4_proc_mkdir(dir, name, sattr,
- fhandle, fattr),
+ _nfs4_proc_mkdir(dir, dentry, sattr),
&exception);
} while (exception.retry);
return err;
diff -puN fs/nfs/proc.c~nfsacl-nfs-mkdir-cleanup fs/nfs/proc.c
--- 25/fs/nfs/proc.c~nfsacl-nfs-mkdir-cleanup 2005-02-28 16:17:56.000000000 -0800
+++ 25-akpm/fs/nfs/proc.c 2005-02-28 16:17:56.000000000 -0800
@@ -402,24 +402,27 @@ nfs_proc_symlink(struct inode *dir, stru
}
static int
-nfs_proc_mkdir(struct inode *dir, struct qstr *name, struct iattr *sattr,
- struct nfs_fh *fhandle, struct nfs_fattr *fattr)
+nfs_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr)
{
+ struct nfs_fh fh;
+ struct nfs_fattr fattr;
struct nfs_createargs arg = {
.fh = NFS_FH(dir),
- .name = name->name,
- .len = name->len,
+ .name = dentry->d_name.name,
+ .len = dentry->d_name.len,
.sattr = sattr
};
struct nfs_diropok res = {
- .fh = fhandle,
- .fattr = fattr
+ .fh = &fh,
+ .fattr = &fattr
};
int status;
- dprintk("NFS call mkdir %s\n", name->name);
- fattr->valid = 0;
+ dprintk("NFS call mkdir %s\n", dentry->d_name.name);
+ fattr.valid = 0;
status = rpc_call(NFS_CLIENT(dir), NFSPROC_MKDIR, &arg, &res, 0);
+ if (!status)
+ status = nfs_instantiate(dentry, &fh, &fattr);
dprintk("NFS reply mkdir: %d\n", status);
return status;
}
diff -puN include/linux/nfs_xdr.h~nfsacl-nfs-mkdir-cleanup include/linux/nfs_xdr.h
--- 25/include/linux/nfs_xdr.h~nfsacl-nfs-mkdir-cleanup 2005-02-28 16:17:56.000000000 -0800
+++ 25-akpm/include/linux/nfs_xdr.h 2005-02-28 16:17:56.000000000 -0800
@@ -693,8 +693,7 @@ struct nfs_rpc_ops {
int (*symlink) (struct inode *, struct qstr *, struct qstr *,
struct iattr *, struct nfs_fh *,
struct nfs_fattr *);
- int (*mkdir) (struct inode *, struct qstr *, struct iattr *,
- struct nfs_fh *, struct nfs_fattr *);
+ int (*mkdir) (struct inode *, struct dentry *, struct iattr *);
int (*rmdir) (struct inode *, struct qstr *);
int (*readdir) (struct dentry *, struct rpc_cred *,
u64, struct page *, unsigned int, int);
_