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>

diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
index 91f5b13..8de0ac2 100644 (file)
--- a/include/linux/sunrpc/rpc_pipe_fs.h
+++ b/include/linux/sunrpc/rpc_pipe_fs.h
@@ -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 *);
-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 *);
 extern struct dentry *rpc_mkpipe(struct dentry *, const char *, void *,
                                 const struct rpc_pipe_ops *, int flags);
 extern int rpc_unlink(struct dentry *);

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index ebfcf9b..6ec3770 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -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';
                                "%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);
                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)) {
 
 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:
                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)) {
        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) {
                rpc_put_mount();
        }
        if (clnt->cl_parent != clnt) {

diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 2a4e6eb..08580be 100644 (file)
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -755,7 +755,7 @@ out_bad:
 }
 
 /**
 }
 
 /**

- * 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
  *
  * @path: path from the rpc_pipefs root to the new directory
  * @rpc_client: rpc client to associate with this directory
  *


@@ -764,8 +764,8 @@ out_bad:
  * information about the client, together with any "pipes" that may
  * later be created using rpc_mkpipe().
  */
  * 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;
 {
        struct nameidata nd;
        struct dentry *dentry;


@@ -797,11 +797,10 @@ out_err:
 }
 
 /**
 }
 
 /**

- * 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
-rpc_rmdir(struct dentry *dentry)
+int rpc_remove_client_dir(struct dentry *dentry)

 {
        struct dentry *parent;
        struct inode *dir;
 {
        struct dentry *parent;
        struct inode *dir;