diff options
| -rw-r--r-- | fs/locks.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/fs/locks.c b/fs/locks.c index b9f3a0bed300..da1d0ddb4abd 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
| @@ -1367,18 +1367,20 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) | |||
| 1367 | 1367 | ||
| 1368 | lease = *flp; | 1368 | lease = *flp; |
| 1369 | 1369 | ||
| 1370 | error = -EAGAIN; | 1370 | if (arg != F_UNLCK) { |
| 1371 | if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0)) | 1371 | error = -EAGAIN; |
| 1372 | goto out; | 1372 | if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0)) |
| 1373 | if ((arg == F_WRLCK) | 1373 | goto out; |
| 1374 | && ((atomic_read(&dentry->d_count) > 1) | 1374 | if ((arg == F_WRLCK) |
| 1375 | || (atomic_read(&inode->i_count) > 1))) | 1375 | && ((atomic_read(&dentry->d_count) > 1) |
| 1376 | goto out; | 1376 | || (atomic_read(&inode->i_count) > 1))) |
| 1377 | goto out; | ||
| 1377 | 1378 | ||
| 1378 | error = -ENOMEM; | 1379 | error = -ENOMEM; |
| 1379 | new_fl = locks_alloc_lock(); | 1380 | new_fl = locks_alloc_lock(); |
| 1380 | if (new_fl == NULL) | 1381 | if (new_fl == NULL) |
| 1381 | goto out; | 1382 | goto out; |
| 1383 | } | ||
| 1382 | 1384 | ||
| 1383 | /* | 1385 | /* |
| 1384 | * At this point, we know that if there is an exclusive | 1386 | * At this point, we know that if there is an exclusive |