# HG changeset patch
# User hozer@minbar-g5.scl.ameslab.gov
# Node ID f2b66f75ac858c7eacf681c73ddad3f0058df480
# Parent  28e3d8204fdbfc0f2bef6dd513ab79184047a1ab
Change mount name to 'kafs' and allow setting the cache manager port

diff -r 28e3d8204fdb -r f2b66f75ac85 fs/afs/main.c
--- a/fs/afs/main.c	Fri Jun 23 22:47:27 2006 +0700
+++ b/fs/afs/main.c	Fri Jun 23 18:11:35 2006 -0500
@@ -42,6 +42,11 @@ module_param(rootcell, charp, 0);
 module_param(rootcell, charp, 0);
 MODULE_PARM_DESC(rootcell, "root AFS cell name and VL server IP addr list");
 
+static uint rxrpc_port = 7001;
+
+module_param(rxrpc_port, uint, 0);
+MODULE_PARM_DESC(rxrpc_port, "kAFS cache manager port (default 7001)");
+
 
 static struct rxrpc_peer_ops afs_peer_ops = {
 	.adding		= afs_adding_peer,
@@ -57,7 +62,7 @@ static struct cachefs_netfs_operations a
 };
 
 struct cachefs_netfs afs_cache_netfs = {
-	.name			= "afs",
+	.name			= "kafs",
 	.version		= 0,
 	.ops			= &afs_cache_ops,
 };
@@ -71,7 +76,8 @@ static int __init afs_init(void)
 {
 	int loop, ret;
 
-	printk(KERN_INFO "kAFS: Red Hat AFS client v0.1 registering.\n");
+	printk(KERN_INFO "kAFS: Red Hat AFS client v0.1 registering, using port %d.\n",
+			rxrpc_port);
 
 	/* initialise the callback hash table */
 	spin_lock_init(&afs_cb_hash_lock);
@@ -113,7 +119,7 @@ static int __init afs_init(void)
 		goto error_kafstimod;
 
 	/* create the RxRPC transport */
-	ret = rxrpc_create_transport(7001, &afs_transport);
+	ret = rxrpc_create_transport(rxrpc_port, &afs_transport);
 	if (ret < 0)
 		goto error_kafsasyncd;
 
diff -r 28e3d8204fdb -r f2b66f75ac85 fs/afs/mntpt.c
--- a/fs/afs/mntpt.c	Fri Jun 23 22:47:27 2006 +0700
+++ b/fs/afs/mntpt.c	Fri Jun 23 18:11:35 2006 -0500
@@ -203,7 +203,7 @@ static struct vfsmount *afs_mntpt_do_aut
 
 	/* try and do the mount */
 	kdebug("--- attempting mount %s -o %s ---", devname, options);
-	mnt = do_kern_mount("afs", 0, devname, options);
+	mnt = do_kern_mount("kafs", 0, devname, options);
 	kdebug("--- mount result %p ---", mnt);
 
 	free_page((unsigned long) devname);
diff -r 28e3d8204fdb -r f2b66f75ac85 fs/afs/super.c
--- a/fs/afs/super.c	Fri Jun 23 22:47:27 2006 +0700
+++ b/fs/afs/super.c	Fri Jun 23 18:11:35 2006 -0500
@@ -50,7 +50,7 @@ static void afs_destroy_inode(struct ino
 
 static struct file_system_type afs_fs_type = {
 	.owner		= THIS_MODULE,
-	.name		= "afs",
+	.name		= "kafs",
 	.get_sb		= afs_get_sb,
 	.kill_sb	= kill_anon_super,
 	.fs_flags	= FS_BINARY_MOUNTDATA,