From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 20 Jan 2012 18:53:56 +0000 (-0500)
Subject: SUNRPC: constify rpc_program->name
X-Git-Tag: firefly_0821_release~3680^2~3284^2~149
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=080b794ce5ad318ce34c52abaedf1bc6788a5abb;p=firefly-linux-kernel-4.4.55.git

SUNRPC: constify rpc_program->name

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
index db6970ced9bc..4a46ffd73a04 100644
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
@@ -70,12 +70,12 @@ struct rpc_clnt {
  */
 #define RPC_MAXVERSION		4
 struct rpc_program {
-	char *			name;		/* protocol name */
+	const char *		name;		/* protocol name */
 	u32			number;		/* program number */
 	unsigned int		nrvers;		/* number of versions */
 	struct rpc_version **	version;	/* version array */
 	struct rpc_stat *	stats;		/* statistics */
-	char *			pipe_dir_name;	/* path to rpc_pipefs dir */
+	const char *		pipe_dir_name;	/* path to rpc_pipefs dir */
 };
 
 struct rpc_version {
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index e9b22e8e16c7..1b2317fa4043 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -118,7 +118,8 @@ static void rpc_clnt_remove_pipedir(struct rpc_clnt *clnt)
 }
 
 static struct dentry *rpc_setup_pipedir_sb(struct super_block *sb,
-				    struct rpc_clnt *clnt, char *dir_name)
+				    struct rpc_clnt *clnt,
+				    const char *dir_name)
 {
 	static uint32_t clntid;
 	char name[15];
@@ -151,7 +152,7 @@ static struct dentry *rpc_setup_pipedir_sb(struct super_block *sb,
 }
 
 static int
-rpc_setup_pipedir(struct rpc_clnt *clnt, char *dir_name)
+rpc_setup_pipedir(struct rpc_clnt *clnt, const char *dir_name)
 {
 	struct super_block *pipefs_sb;
 	struct dentry *dentry;