openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

SUNRPC: Rename rpc_mkdir to rpc_create_client_dir() 

This reflects the fact that rpc_mkdir() as it stands today, can only create
a RPC client type directory.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2009-08-09 15:14:22 -04:00
parent bb1567491e
commit 458adb8ba9
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/sunrpc/rpc_pipe_fs.h
View File

@ -44,8 +44,9 @@ RPC_I(struct inode *inode)
extern int rpc_queue_upcall(struct inode *, struct rpc_pipe_msg *); extern int rpc_queue_upcall(struct inode *, struct rpc_pipe_msg *);
extern struct dentry *rpc_mkdir(char *, struct rpc_clnt *); struct rpc_clnt;
extern int rpc_rmdir(struct dentry *); extern struct dentry *rpc_create_client_dir(const char *, struct rpc_clnt *);
extern int rpc_remove_client_dir(struct dentry *);
extern struct dentry *rpc_mkpipe(struct dentry *, const char *, void *, extern struct dentry *rpc_mkpipe(struct dentry *, const char *, void *,
const struct rpc_pipe_ops *, int flags); const struct rpc_pipe_ops *, int flags);
extern int rpc_unlink(struct dentry *); extern int rpc_unlink(struct dentry *);

6
net/sunrpc/clnt.c
View File

@ -113,7 +113,7 @@ rpc_setup_pipedir(struct rpc_clnt *clnt, char *dir_name)
"%s/clnt%x", dir_name, "%s/clnt%x", dir_name,
(unsigned int)clntid++); (unsigned int)clntid++);
clnt->cl_pathname[sizeof(clnt->cl_pathname) - 1] = '\0'; clnt->cl_pathname[sizeof(clnt->cl_pathname) - 1] = '\0';
clnt->cl_dentry = rpc_mkdir(clnt->cl_pathname, clnt); clnt->cl_dentry = rpc_create_client_dir(clnt->cl_pathname, clnt);
if (!IS_ERR(clnt->cl_dentry)) if (!IS_ERR(clnt->cl_dentry))
return 0; return 0;
error = PTR_ERR(clnt->cl_dentry); error = PTR_ERR(clnt->cl_dentry);
@ -232,7 +232,7 @@ static struct rpc_clnt * rpc_new_client(const struct rpc_create_args *args, stru
out_no_auth: out_no_auth:
if (!IS_ERR(clnt->cl_dentry)) { if (!IS_ERR(clnt->cl_dentry)) {
rpc_rmdir(clnt->cl_dentry); rpc_remove_client_dir(clnt->cl_dentry);
rpc_put_mount(); rpc_put_mount();
} }
out_no_path: out_no_path:
@ -424,7 +424,7 @@ rpc_free_client(struct kref *kref)
dprintk("RPC: destroying %s client for %s\n", dprintk("RPC: destroying %s client for %s\n",
clnt->cl_protname, clnt->cl_server); clnt->cl_protname, clnt->cl_server);
if (!IS_ERR(clnt->cl_dentry)) { if (!IS_ERR(clnt->cl_dentry)) {
rpc_rmdir(clnt->cl_dentry); rpc_remove_client_dir(clnt->cl_dentry);
rpc_put_mount(); rpc_put_mount();
} }
if (clnt->cl_parent != clnt) { if (clnt->cl_parent != clnt) {

11
net/sunrpc/rpc_pipe.c
View File

@ -755,7 +755,7 @@ static int rpc_populate(struct dentry *parent,
} }
/** /**
* rpc_mkdir - Create a new directory in rpc_pipefs * rpc_create_client_dir - Create a new rpc_client directory in rpc_pipefs
* @path: path from the rpc_pipefs root to the new directory * @path: path from the rpc_pipefs root to the new directory
* @rpc_client: rpc client to associate with this directory * @rpc_client: rpc client to associate with this directory
* *
@ -764,8 +764,8 @@ static int rpc_populate(struct dentry *parent,
* information about the client, together with any "pipes" that may * information about the client, together with any "pipes" that may
* later be created using rpc_mkpipe(). * later be created using rpc_mkpipe().
*/ */
struct dentry * struct dentry *rpc_create_client_dir(const char *path,
rpc_mkdir(char *path, struct rpc_clnt *rpc_client) struct rpc_clnt *rpc_client)
{ {
struct nameidata nd; struct nameidata nd;
struct dentry *dentry; struct dentry *dentry;
@ -797,11 +797,10 @@ rpc_mkdir(char *path, struct rpc_clnt *rpc_client)
} }
/** /**
* rpc_rmdir - Remove a directory created with rpc_mkdir() * rpc_remove_client_dir - Remove a directory created with rpc_create_client_dir()
* @dentry: directory to remove * @dentry: directory to remove
*/ */
int int rpc_remove_client_dir(struct dentry *dentry)
rpc_rmdir(struct dentry *dentry)
{ {
struct dentry *parent; struct dentry *parent;
struct inode *dir; struct inode *dir;