diff --git a/[refs] b/[refs]
index 4b990154a0c2..c337cc77cefa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f382894e8889a64f8daf747db477a16da2d54eb0
+refs/heads/master: 116ad29d9839610d2811a1962cac7f3f2a9f9295
diff --git a/trunk/fs/gfs2/locking/nolock/main.c b/trunk/fs/gfs2/locking/nolock/main.c
index 57f9e50832f0..9398309f2810 100644
--- a/trunk/fs/gfs2/locking/nolock/main.c
+++ b/trunk/fs/gfs2/locking/nolock/main.c
@@ -33,9 +33,6 @@ static int nolock_mount(char *table_name, char *host_data,
 	unsigned int jid;
 	struct nolock_lockspace *nl;
 
-	/* If there is a "jid=" in the hostdata, return that jid.
-	   Otherwise, return zero. */
-
 	c = strstr(host_data, "jid=");
 	if (!c)
 		jid = 0;