From 87a001bd3a3ef23f4d16cd4f7868d6f03f792106 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Fri, 13 Jul 2012 13:35:36 -0400
Subject: [PATCH] --- yaml --- r: 311911 b: refs/heads/master c:
 8d657eb3b43861064d36241e88d9d61c709f33f0 h: refs/heads/master i:   311909:
 9deee075e220fbe7029f967e431800d54d53de3a   311907:
 5bdfa7475ef4f6e3441056cb3f863a0b8444bc6e   311903:
 ec382328f670398db280f7c497a140fc284d1b9f v: v3

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

diff --git a/[refs] b/[refs]
index 33fb2fea51a5..33b95832dba0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39ea32ca7e425cde24df04f34bf76746ea028681
+refs/heads/master: 8d657eb3b43861064d36241e88d9d61c709f33f0
diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
index 814c51d0de47..fce6238d52c1 100644
--- a/trunk/fs/locks.c
+++ b/trunk/fs/locks.c
@@ -1465,7 +1465,7 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp)
 	case F_WRLCK:
 		return generic_add_lease(filp, arg, flp);
 	default:
-		BUG();
+		return -EINVAL;
 	}
 }
 EXPORT_SYMBOL(generic_setlease);