Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy...

[firefly-linux-kernel-4.4.55.git] / fs / locks.c

diff --git a/fs/locks.c b/fs/locks.c
index 814c51d0de4739e4b89e9091e00c17f284c0e2ba..fce6238d52c1bf742307325a588d545e169508e4 100644 (file)
--- a/fs/locks.c
+++ b/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);