diff --git a/[refs] b/[refs]
index 7b4c8a0a1f4c..366a226d19ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e60029f403781b8a63b7ffdb7dc1faff6ca651e
+refs/heads/master: 4267c9561d9c3bb2abf45abed9c75a1c892d7d15
diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c
index ee80ff341d37..439292aa1ec6 100644
--- a/trunk/fs/compat.c
+++ b/trunk/fs/compat.c
@@ -702,9 +702,6 @@ static int do_nfs4_super_data_conv(void *raw_data)
 		real->flags = raw->flags;
 		real->version = raw->version;
 	}
-	else {
-		return -EINVAL;
-	}
 
 	return 0;
 }