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);