diff options
Diffstat (limited to 'fs/locks.c')
-rw-r--r-- | fs/locks.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/locks.c b/fs/locks.c index da1d0ddb4abd..6a132cd4fa57 100644 --- a/fs/locks.c +++ b/fs/locks.c | |||
@@ -1368,6 +1368,11 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) | |||
1368 | lease = *flp; | 1368 | lease = *flp; |
1369 | 1369 | ||
1370 | if (arg != F_UNLCK) { | 1370 | if (arg != F_UNLCK) { |
1371 | error = -ENOMEM; | ||
1372 | new_fl = locks_alloc_lock(); | ||
1373 | if (new_fl == NULL) | ||
1374 | goto out; | ||
1375 | |||
1371 | error = -EAGAIN; | 1376 | error = -EAGAIN; |
1372 | if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0)) | 1377 | if ((arg == F_RDLCK) && (atomic_read(&inode->i_writecount) > 0)) |
1373 | goto out; | 1378 | goto out; |
@@ -1375,11 +1380,6 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) | |||
1375 | && ((atomic_read(&dentry->d_count) > 1) | 1380 | && ((atomic_read(&dentry->d_count) > 1) |
1376 | || (atomic_read(&inode->i_count) > 1))) | 1381 | || (atomic_read(&inode->i_count) > 1))) |
1377 | goto out; | 1382 | goto out; |
1378 | |||
1379 | error = -ENOMEM; | ||
1380 | new_fl = locks_alloc_lock(); | ||
1381 | if (new_fl == NULL) | ||
1382 | goto out; | ||
1383 | } | 1383 | } |
1384 | 1384 | ||
1385 | /* | 1385 | /* |