diff options
| author | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
| commit | 72ea1f74fcdf874cca6d2c0962379523bbd99e2c (patch) | |
| tree | 4c67be6c73356086ff44ef1b8b1c9479702689ca /fs/locks.c | |
| parent | b1af9be5ef77898c05667bb9dbf3b180d91d3292 (diff) | |
| parent | a73ff3231df59a4b92ccd0dd4e73897c5822489b (diff) | |
Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/drivers
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/locks.c b/fs/locks.c index 814c51d0de47..fce6238d52c1 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
| @@ -1465,7 +1465,7 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) | |||
| 1465 | case F_WRLCK: | 1465 | case F_WRLCK: |
| 1466 | return generic_add_lease(filp, arg, flp); | 1466 | return generic_add_lease(filp, arg, flp); |
| 1467 | default: | 1467 | default: |
| 1468 | BUG(); | 1468 | return -EINVAL; |
| 1469 | } | 1469 | } |
| 1470 | } | 1470 | } |
| 1471 | EXPORT_SYMBOL(generic_setlease); | 1471 | EXPORT_SYMBOL(generic_setlease); |