diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-18 01:15:45 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-18 01:15:45 -0400 |
| commit | ea6e1e94f2cb9ae54bd1428e1ef3e84a749ceed8 (patch) | |
| tree | 712ae925e95105b763b2fd851348288c53e78d55 /fs/locks.c | |
| parent | db9ca5803566078aafe63cf364ef98b5097e4194 (diff) | |
| parent | 427abfa28afedffadfca9dd8b067eb6d36bac53f (diff) | |
| download | kernel-crypto-ea6e1e94f2cb9ae54bd1428e1ef3e84a749ceed8.tar.gz kernel-crypto-ea6e1e94f2cb9ae54bd1428e1ef3e84a749ceed8.tar.xz kernel-crypto-ea6e1e94f2cb9ae54bd1428e1ef3e84a749ceed8.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/locks.c')
| -rw-r--r-- | fs/locks.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/locks.c b/fs/locks.c index 6f99c0a6f83..ab61a8b5482 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -755,6 +755,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request) if (request->fl_type == F_UNLCK) goto out; + error = -ENOMEM; new_fl = locks_alloc_lock(); if (new_fl == NULL) goto out; @@ -781,6 +782,7 @@ static int flock_lock_file(struct file *filp, struct file_lock *request) locks_copy_lock(new_fl, request); locks_insert_lock(&inode->i_flock, new_fl); new_fl = NULL; + error = 0; out: unlock_kernel(); |