Commit 458adb8b authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent bb156749

include/linux/sunrpc/rpc_pipe_fs.h

+3 −2
Original line number Diff line number Diff line
@@ -44,8 +44,9 @@ RPC_I(struct inode *inode) 


extern int rpc_queue_upcall(struct inode *, struct rpc_pipe_msg *);



extern struct dentry *rpc_mkdir(char *, struct rpc_clnt *);

extern int rpc_rmdir(struct dentry *);

struct rpc_clnt;

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 *,

				 const struct rpc_pipe_ops *, int flags);

extern int rpc_unlink(struct dentry *);

net/sunrpc/clnt.c

+3 −3
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ rpc_setup_pipedir(struct rpc_clnt *clnt, char *dir_name) 
				"%s/clnt%x", dir_name,

				(unsigned int)clntid++);

		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))

			return 0;

		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:

	if (!IS_ERR(clnt->cl_dentry)) {

		rpc_rmdir(clnt->cl_dentry);

		rpc_remove_client_dir(clnt->cl_dentry);

		rpc_put_mount();

	}

out_no_path:
@@ -424,7 +424,7 @@ rpc_free_client(struct kref *kref) 
	dprintk("RPC:       destroying %s client for %s\n",

			clnt->cl_protname, clnt->cl_server);

	if (!IS_ERR(clnt->cl_dentry)) {

		rpc_rmdir(clnt->cl_dentry);

		rpc_remove_client_dir(clnt->cl_dentry);

		rpc_put_mount();

	}

	if (clnt->cl_parent != clnt) {

net/sunrpc/rpc_pipe.c

+5 −6
Original line number Diff line number Diff line
@@ -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

 * @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

 * later be created using rpc_mkpipe().

 */

struct dentry *

rpc_mkdir(char *path, struct rpc_clnt *rpc_client)

struct dentry *rpc_create_client_dir(const char *path,

				     struct rpc_clnt *rpc_client)

{

	struct nameidata nd;

	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

 */

int

rpc_rmdir(struct dentry *dentry)

int rpc_remove_client_dir(struct dentry *dentry)

{

	struct dentry *parent;

	struct inode *dir;