diff --git a/[refs] b/[refs]
index 870aaa443058..d4f6d45e951a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30087baf8810cd96b0ca2858993f29a89965ffff
+refs/heads/master: 57070d012cd425c3a71663528c56a436abd2d9da
diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c
index 2a88477330fc..263990ae4096 100644
--- a/trunk/fs/compat.c
+++ b/trunk/fs/compat.c
@@ -2170,9 +2170,12 @@ asmlinkage long compat_sys_nfsservctl(int cmd, struct compat_nfsctl_arg __user *
 
 	default:
 		err = -EINVAL;
-		goto done;
+		break;
 	}
 
+	if (err)
+		goto done;
+
 	oldfs = get_fs();
 	set_fs(KERNEL_DS);
 	/* The __user pointer casts are valid because of the set_fs() */