From 637337987aff8ed62e7515991acacd02b6657334 Mon Sep 17 00:00:00 2001
From: Peter Staubach <staubach@redhat.com>
Date: Sat, 25 Mar 2006 03:08:04 -0800
Subject: [PATCH] --- yaml --- r: 23591 b: refs/heads/master c:
 57070d012cd425c3a71663528c56a436abd2d9da h: refs/heads/master i:   23589:
 cf65df46b4bc8558800be926fb1a4dfd8b66825c   23587:
 bb7644d0b9dc8c5191a88402d195cf667f6a8b0d   23583:
 6d671707134fcbe92bcf4f767766925f053d735d v: v3

---
 [refs]            | 2 +-
 trunk/fs/compat.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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() */