diff --git a/[refs] b/[refs]
index dad0c34504e6..0b4f65b7a7f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87250dd26a34c65ae31d08837174222889007641
+refs/heads/master: d2ab0b0c4c2570921a9ec1eff1e3a5143e05b231
diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
index 924e4a7fb1d5..3c23fd261022 100644
--- a/trunk/fs/locks.c
+++ b/trunk/fs/locks.c
@@ -1348,9 +1348,7 @@ static int __setlease(struct file *filp, long arg, struct file_lock **flp)
 
 	time_out_leases(inode);
 
-	error = -EINVAL;
-	if (!flp || !(*flp) || !(*flp)->fl_lmops || !(*flp)->fl_lmops->fl_break)
-		goto out;
+	BUG_ON(!(*flp)->fl_lmops->fl_break);
 
 	lease = *flp;