From 087dd6ca1b8c5397ea9c776fdab30f7c70185d07 Mon Sep 17 00:00:00 2001
From: Tom Talpey <tmtalpey@gmail.com>
Date: Wed, 11 Mar 2009 14:37:56 -0400
Subject: [PATCH] --- yaml --- r: 139527 b: refs/heads/master c:
 a67d18f89f5782806135aad4ee012ff78d45aae7 h: refs/heads/master i:   139525:
 4f03161560d18b82a54d4ae3ce0a4cbaa1b1b380   139523:
 393e582cd1bd280a10106b9789252bb09dbfc999   139519:
 748b8fbd349650ee79da3fc7f28c720c22fc3805 v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/super.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b5088999a780..eacfab8a8e65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 441e3e242903f9b190d5764bed73edb58f977413
+refs/heads/master: a67d18f89f5782806135aad4ee012ff78d45aae7
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index d6686f4786dc..0942fcbbad3c 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -1018,6 +1018,7 @@ static int nfs_parse_mount_options(char *raw,
 		case Opt_rdma:
 			mnt->flags |= NFS_MOUNT_TCP; /* for side protocols */
 			mnt->nfs_server.protocol = XPRT_TRANSPORT_RDMA;
+			xprt_load_transport(p);
 			break;
 		case Opt_acl:
 			mnt->flags &= ~NFS_MOUNT_NOACL;
@@ -1205,12 +1206,14 @@ static int nfs_parse_mount_options(char *raw,
 				/* vector side protocols to TCP */
 				mnt->flags |= NFS_MOUNT_TCP;
 				mnt->nfs_server.protocol = XPRT_TRANSPORT_RDMA;
+				xprt_load_transport(string);
 				break;
 			default:
 				errors++;
 				dfprintk(MOUNT, "NFS:   unrecognized "
 						"transport protocol\n");
 			}
+			kfree(string);
 			break;
 		case Opt_mountproto:
 			string = match_strdup(args);
@@ -1218,7 +1221,6 @@ static int nfs_parse_mount_options(char *raw,
 				goto out_nomem;
 			token = match_token(string,
 					    nfs_xprt_protocol_tokens, args);
-			kfree(string);
 
 			switch (token) {
 			case Opt_xprt_udp: