Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

SUNRPC: make rpc_unlink() take a dentry argument instead of a path

Browse source 
Signe-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
(cherry picked from 88bf6d811b01a4be7fd507d18bf5f1c527989089 commit)
This commit is contained in:
Trond Myklebust 2006-07-31 14:11:48 -07:00
parent a634904a7d
commit 5d67476fff
4 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs/nfs/idmap.c
View file

@ -130,9 +130,8 @@ nfs_idmap_delete(struct nfs4_client *clp)
if (!idmap) if (!idmap)
return; return;
rpc_unlink(idmap->idmap_dentry);
dput(idmap->idmap_dentry); dput(idmap->idmap_dentry);
idmap->idmap_dentry = NULL;
rpc_unlink(idmap->idmap_path);
clp->cl_idmap = NULL; clp->cl_idmap = NULL;
kfree(idmap); kfree(idmap);
} }

2
include/linux/sunrpc/rpc_pipe_fs.h
View file

@ -44,7 +44,7 @@ extern int rpc_queue_upcall(struct inode *, struct rpc_pipe_msg *);
extern struct dentry *rpc_mkdir(char *, struct rpc_clnt *); extern struct dentry *rpc_mkdir(char *, struct rpc_clnt *);
extern int rpc_rmdir(char *); extern int rpc_rmdir(char *);
extern struct dentry *rpc_mkpipe(char *, void *, struct rpc_pipe_ops *, int flags); extern struct dentry *rpc_mkpipe(char *, void *, struct rpc_pipe_ops *, int flags);
extern int rpc_unlink(char *); extern int rpc_unlink(struct dentry *);
extern struct vfsmount *rpc_get_mount(void); extern struct vfsmount *rpc_get_mount(void);
extern void rpc_put_mount(void); extern void rpc_put_mount(void);

2
net/sunrpc/auth_gss/auth_gss.c
View file

@ -718,7 +718,7 @@ gss_destroy(struct rpc_auth *auth)
auth, auth->au_flavor); auth, auth->au_flavor);
gss_auth = container_of(auth, struct gss_auth, rpc_auth); gss_auth = container_of(auth, struct gss_auth, rpc_auth);
rpc_unlink(gss_auth->path); rpc_unlink(gss_auth->dentry);
dput(gss_auth->dentry); dput(gss_auth->dentry);
gss_auth->dentry = NULL; gss_auth->dentry = NULL;
gss_mech_put(gss_auth->mech); gss_mech_put(gss_auth->mech);

20
net/sunrpc/rpc_pipe.c
View file

@ -746,22 +746,15 @@ rpc_mkpipe(char *path, void *private, struct rpc_pipe_ops *ops, int flags)
} }
int int
rpc_unlink(char *path) rpc_unlink(struct dentry *dentry)
{ {
struct nameidata nd; struct dentry *parent;
struct dentry *dentry;
struct inode *dir; struct inode *dir;
int error; int error = 0;
if ((error = rpc_lookup_parent(path, &nd)) != 0) parent = dget_parent(dentry);
return error; dir = parent->d_inode;
dir = nd.dentry->d_inode;
mutex_lock_nested(&dir->i_mutex, I_MUTEX_PARENT); mutex_lock_nested(&dir->i_mutex, I_MUTEX_PARENT);
dentry = lookup_one_len(nd.last.name, nd.dentry, nd.last.len);
if (IS_ERR(dentry)) {
error = PTR_ERR(dentry);
goto out_release;
}
d_drop(dentry); d_drop(dentry);
if (dentry->d_inode) { if (dentry->d_inode) {
rpc_close_pipes(dentry->d_inode); rpc_close_pipes(dentry->d_inode);
@ -769,9 +762,8 @@ rpc_unlink(char *path)
} }
dput(dentry); dput(dentry);
inode_dir_notify(dir, DN_DELETE); inode_dir_notify(dir, DN_DELETE);
out_release:
mutex_unlock(&dir->i_mutex); mutex_unlock(&dir->i_mutex);
rpc_release_path(&nd); dput(parent);
return error; return error;
} }